Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
tiagohm committed May 11, 2024
2 parents 01e32b0 + 4d12892 commit c8ff962
Show file tree
Hide file tree
Showing 251 changed files with 5,103 additions and 5,943 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/angular.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Set up Node
uses: actions/setup-node@v4
with:
node-version: 20
node-version: 22

- name: Install Dependencies
run: npm i
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
- name: Set up Node
uses: actions/setup-node@v4
with:
node-version: 20
node-version: 22

- name: Download API
uses: actions/download-artifact@v4
Expand Down
6 changes: 3 additions & 3 deletions api/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import org.springframework.boot.gradle.tasks.bundling.BootJar

plugins {
kotlin("jvm")
id("org.springframework.boot") version "3.2.4"
id("org.springframework.boot") version "3.2.5"
id("io.spring.dependency-management") version "1.1.4"
kotlin("plugin.spring")
kotlin("kapt")
Expand All @@ -14,7 +14,6 @@ dependencies {
implementation(project(":nebulosa-astap"))
implementation(project(":nebulosa-astrometrynet"))
implementation(project(":nebulosa-alpaca-indi"))
implementation(project(":nebulosa-batch-processing"))
implementation(project(":nebulosa-common"))
implementation(project(":nebulosa-guiding-phd2"))
implementation(project(":nebulosa-hips2fits"))
Expand All @@ -30,6 +29,7 @@ dependencies {
implementation(project(":nebulosa-watney"))
implementation(project(":nebulosa-wcs"))
implementation(project(":nebulosa-xisf"))
implementation(libs.rx)
implementation(libs.apache.codec)
implementation(libs.csv)
implementation(libs.eventbus)
Expand All @@ -46,7 +46,7 @@ dependencies {
implementation("org.springframework.boot:spring-boot-starter-undertow")
implementation("org.jetbrains.kotlin:kotlin-reflect")
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
kapt("org.springframework:spring-context-indexer:6.1.5")
kapt("org.springframework:spring-context-indexer:6.1.6")
testImplementation(project(":nebulosa-astrobin-api"))
testImplementation(project(":nebulosa-skycatalog-stellarium"))
testImplementation(project(":nebulosa-test"))
Expand Down
98 changes: 47 additions & 51 deletions api/schemas/objectbox.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,214 +4,210 @@
"_note3": "If you have VCS merge conflicts, you must resolve them according to ObjectBox docs.",
"entities": [
{
"id": "1:659766577132862050",
"lastPropertyId": "13:7107587391686688306",
"id": "1:4508028933515523414",
"lastPropertyId": "13:5569629325911720184",
"name": "CalibrationFrameEntity",
"properties": [
{
"id": "1:2268113761903193037",
"id": "1:279471804400581871",
"name": "id",
"type": 6,
"flags": 1
},
{
"id": "2:1598928230620079098",
"id": "2:9048727858630632737",
"name": "type",
"indexId": "1:7442085554692140361",
"indexId": "1:3018423918314968566",
"type": 5,
"flags": 8
},
{
"id": "3:7997224882771694883",
"id": "3:5712791023807889534",
"name": "name",
"indexId": "2:6070065848831656560",
"indexId": "2:8432810603549739468",
"type": 9,
"flags": 2048
},
{
"id": "4:1812743003555250552",
"id": "4:3434117744352502900",
"name": "filter",
"indexId": "3:5789122857555378891",
"type": 9,
"flags": 2048
"type": 9
},
{
"id": "5:5895526385719301255",
"id": "5:1871034143652415809",
"name": "exposureTime",
"type": 6
},
{
"id": "6:1217849729581288112",
"id": "6:8846123268014704509",
"name": "temperature",
"type": 8
},
{
"id": "7:4483343404132984385",
"id": "7:8561154143050278063",
"name": "width",
"type": 5
},
{
"id": "8:4673309899326922479",
"id": "8:6920579444153489022",
"name": "height",
"type": 5
},
{
"id": "9:4928491775921601028",
"id": "9:4300769060778976734",
"name": "binX",
"type": 5
},
{
"id": "10:7407952871178343222",
"id": "10:4693474237106002327",
"name": "binY",
"type": 5
},
{
"id": "11:1772645455690083085",
"id": "11:8369728096653684761",
"name": "gain",
"type": 8
},
{
"id": "12:1957209335781305189",
"id": "12:617052828938607363",
"name": "path",
"indexId": "4:407713126153778253",
"type": 9,
"flags": 2080
"type": 9
},
{
"id": "13:7107587391686688306",
"id": "13:5569629325911720184",
"name": "enabled",
"type": 1
}
],
"relations": []
},
{
"id": "2:2703822036195087198",
"lastPropertyId": "3:4649483922621116787",
"id": "2:4800249862026080527",
"lastPropertyId": "3:211299529025119304",
"name": "PreferenceEntity",
"properties": [
{
"id": "1:8352093925685013458",
"id": "1:3593540058272630983",
"name": "id",
"type": 6,
"flags": 1
},
{
"id": "2:8332376147713309804",
"id": "2:2699303611424729430",
"name": "key",
"indexId": "5:422443843445456626",
"indexId": "3:2030544424571300028",
"type": 9,
"flags": 34848
},
{
"id": "3:4649483922621116787",
"id": "3:211299529025119304",
"name": "value",
"type": 9
}
],
"relations": []
},
{
"id": "3:134389271270421743",
"lastPropertyId": "4:3302609175063994624",
"id": "3:9190695617085753667",
"lastPropertyId": "4:411434182698925224",
"name": "SatelliteEntity",
"properties": [
{
"id": "1:9030098363904692142",
"id": "1:7748265871438465999",
"name": "id",
"type": 6,
"flags": 129
},
{
"id": "2:111042583962333373",
"id": "2:2980713713220488130",
"name": "name",
"type": 9
},
{
"id": "3:7030648240130620532",
"id": "3:8036745814034214740",
"name": "tle",
"type": 9
},
{
"id": "4:3302609175063994624",
"id": "4:411434182698925224",
"name": "groups",
"type": 30
}
],
"relations": []
},
{
"id": "4:7940094622027054665",
"lastPropertyId": "12:7594216486430476300",
"id": "4:6299583728620001761",
"lastPropertyId": "12:4179508964623201115",
"name": "SimbadEntity",
"properties": [
{
"id": "1:7823466820865818841",
"id": "1:7284883107181783588",
"name": "id",
"type": 6,
"flags": 129
},
{
"id": "2:3815672930103478384",
"id": "2:1059978401562504177",
"name": "name",
"type": 9
},
{
"id": "3:9175198490205670707",
"id": "3:2238737597611607433",
"name": "type",
"type": 5
},
{
"id": "4:2382314709752878141",
"id": "4:6034348124979703831",
"name": "rightAscensionJ2000",
"type": 8
},
{
"id": "5:505218497375297076",
"id": "5:6603670815168137185",
"name": "declinationJ2000",
"type": 8
},
{
"id": "6:8873025996435250547",
"id": "6:4798847469480514750",
"name": "magnitude",
"type": 8
},
{
"id": "7:3149730687054027260",
"id": "7:4280564484498302769",
"name": "pmRA",
"type": 8
},
{
"id": "8:3208786528041087924",
"id": "8:1070997648386390650",
"name": "pmDEC",
"type": 8
},
{
"id": "9:2691231717244757834",
"id": "9:7408560810497672822",
"name": "parallax",
"type": 8
},
{
"id": "10:5070213892916650707",
"id": "10:7464931444484734827",
"name": "radialVelocity",
"type": 8
},
{
"id": "11:6365445684038101726",
"id": "11:531497562996887037",
"name": "redshift",
"type": 8
},
{
"id": "12:7594216486430476300",
"id": "12:4179508964623201115",
"name": "constellation",
"type": 5
}
],
"relations": []
}
],
"lastEntityId": "4:7940094622027054665",
"lastIndexId": "5:422443843445456626",
"lastEntityId": "4:6299583728620001761",
"lastIndexId": "3:2030544424571300028",
"lastRelationId": "0:0",
"lastSequenceId": "0:0",
"modelVersion": 5,
Expand Down
Loading

0 comments on commit c8ff962

Please sign in to comment.