Skip to content

Commit

Permalink
Merge branch 'dev' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
tiagohm committed Oct 1, 2023
2 parents 76416a7 + e118205 commit 5f669a3
Show file tree
Hide file tree
Showing 491 changed files with 32,468 additions and 9,358 deletions.
47 changes: 15 additions & 32 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ ij_formatter_off_tag = @formatter:off
ij_formatter_on_tag = @formatter:on
ij_formatter_tags_enabled = true
ij_smart_tabs = false
ij_visual_guides = none
ij_visual_guides =
ij_wrap_on_typing = false

[*.feature]
indent_size = 2
ij_gherkin_keep_indents_on_empty_lines = false
ij_karate_keep_indents_on_empty_lines = false

[*.java]
ij_java_align_consecutive_assignments = false
Expand Down Expand Up @@ -71,7 +71,7 @@ ij_java_blank_lines_before_package = 0
ij_java_block_brace_style = end_of_line
ij_java_block_comment_add_space = false
ij_java_block_comment_at_first_column = true
ij_java_builder_methods = none
ij_java_builder_methods =
ij_java_call_parameters_new_line_after_left_paren = false
ij_java_call_parameters_right_paren_on_new_line = false
ij_java_call_parameters_wrap = off
Expand Down Expand Up @@ -109,6 +109,8 @@ ij_java_enum_constants_wrap = off
ij_java_extends_keyword_wrap = off
ij_java_extends_list_wrap = off
ij_java_field_annotation_wrap = split_into_lines
ij_java_field_name_prefix =
ij_java_field_name_suffix =
ij_java_finally_on_new_line = false
ij_java_for_brace_force = never
ij_java_for_statement_new_line_after_left_paren = false
Expand Down Expand Up @@ -142,6 +144,8 @@ ij_java_layout_static_imports_separately = true
ij_java_line_comment_add_space = false
ij_java_line_comment_add_space_on_reformat = false
ij_java_line_comment_at_first_column = true
ij_java_local_variable_name_prefix =
ij_java_local_variable_name_suffix =
ij_java_method_annotation_wrap = split_into_lines
ij_java_method_brace_style = end_of_line
ij_java_method_call_chain_wrap = off
Expand All @@ -156,12 +160,15 @@ ij_java_new_line_after_lparen_in_deconstruction_pattern = true
ij_java_new_line_after_lparen_in_record_header = false
ij_java_packages_to_use_import_on_demand = java.awt.*,javax.swing.*
ij_java_parameter_annotation_wrap = off
ij_java_parameter_name_prefix =
ij_java_parameter_name_suffix =
ij_java_parentheses_expression_new_line_after_left_paren = false
ij_java_parentheses_expression_right_paren_on_new_line = false
ij_java_place_assignment_sign_on_next_line = false
ij_java_prefer_longer_names = true
ij_java_prefer_parameters_wrap = false
ij_java_record_components_wrap = normal
ij_java_repeat_annotations =
ij_java_repeat_synchronized = true
ij_java_replace_instanceof_and_cast = false
ij_java_replace_null_check = true
Expand Down Expand Up @@ -251,9 +258,13 @@ ij_java_spaces_within_synchronized_parentheses = false
ij_java_spaces_within_try_parentheses = false
ij_java_spaces_within_while_parentheses = false
ij_java_special_else_if_treatment = true
ij_java_static_field_name_prefix =
ij_java_static_field_name_suffix =
ij_java_subclass_name_prefix =
ij_java_subclass_name_suffix = Impl
ij_java_ternary_operation_signs_on_next_line = false
ij_java_ternary_operation_wrap = off
ij_java_test_name_prefix =
ij_java_test_name_suffix = Test
ij_java_throws_keyword_wrap = off
ij_java_throws_list_wrap = off
Expand All @@ -275,19 +286,6 @@ ij_properties_keep_blank_lines = false
ij_properties_key_value_delimiter = equals
ij_properties_spaces_around_key_value_delimiter = false

[*.proto]
indent_size = 2
tab_width = 2
ij_continuation_indent_size = 4
ij_protobuf_keep_blank_lines_in_code = 2
ij_protobuf_keep_indents_on_empty_lines = false
ij_protobuf_keep_line_breaks = true
ij_protobuf_space_after_comma = true
ij_protobuf_space_before_comma = false
ij_protobuf_spaces_around_assignment_operators = true
ij_protobuf_spaces_within_braces = false
ij_protobuf_spaces_within_brackets = false

[.editorconfig]
ij_editorconfig_align_group_field_declarations = false
ij_editorconfig_space_after_colon = false
Expand All @@ -314,7 +312,6 @@ ij_xml_space_after_tag_name = false
ij_xml_space_around_equals_in_attribute = false
ij_xml_space_inside_empty_tag = false
ij_xml_text_wrap = normal
ij_xml_use_custom_settings = false

[{*.bash,*.sh,*.zsh}]
indent_size = 2
Expand Down Expand Up @@ -593,7 +590,7 @@ ij_kotlin_continuation_indent_in_supertype_lists = false
ij_kotlin_else_on_new_line = false
ij_kotlin_enum_constants_wrap = off
ij_kotlin_extends_list_wrap = normal
ij_kotlin_field_annotation_wrap = normal
ij_kotlin_field_annotation_wrap = off
ij_kotlin_finally_on_new_line = false
ij_kotlin_if_rparen_on_new_line = true
ij_kotlin_import_nested_classes = false
Expand Down Expand Up @@ -665,20 +662,6 @@ ij_markdown_min_lines_between_paragraphs = 1
ij_markdown_wrap_text_if_long = true
ij_markdown_wrap_text_inside_blockquotes = true

[{*.pb,*.textproto}]
indent_size = 2
tab_width = 2
ij_continuation_indent_size = 4
ij_prototext_keep_blank_lines_in_code = 2
ij_prototext_keep_indents_on_empty_lines = false
ij_prototext_keep_line_breaks = true
ij_prototext_space_after_colon = true
ij_prototext_space_after_comma = true
ij_prototext_space_before_colon = false
ij_prototext_space_before_comma = false
ij_prototext_spaces_within_braces = true
ij_prototext_spaces_within_brackets = false

[{*.toml,Cargo.lock,Cargo.toml.orig,Gopkg.lock,Pipfile,poetry.lock}]
ij_toml_keep_indents_on_empty_lines = false

Expand Down
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,5 @@
*.png binary
*.db binary
*.gz binary
*.dll binary
*.so binary
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ jobs:
distribution: 'zulu'
cache: gradle

- name: Install wcstools
run: sudo apt install -y wcstools

- name: Grant execute permission for gradlew
run: chmod +x gradlew

Expand Down
30 changes: 30 additions & 0 deletions GitHub CI.run.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false"
name="GitHub CI"
type="GradleRunConfiguration"
factoryName="Gradle">
<ExternalSystemSettings>
<option name="executionName"/>
<option name="externalProjectPath"
value="$PROJECT_DIR$"/>
<option name="externalSystemIdString"
value="GRADLE"/>
<option name="scriptParameters"
value="-Dgithub=true"/>
<option name="taskDescriptions">
<list/>
</option>
<option name="taskNames">
<list>
<option value="test"/>
</list>
</option>
<option name="vmOptions"/>
</ExternalSystemSettings>
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<RunAsTest>false</RunAsTest>
<method v="2"/>
</configuration>
</component>
30 changes: 30 additions & 0 deletions api/BootJar.run.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false"
name="API BootJar"
type="GradleRunConfiguration"
factoryName="Gradle">
<ExternalSystemSettings>
<option name="executionName"/>
<option name="externalProjectPath"
value="$PROJECT_DIR$/api"/>
<option name="externalSystemIdString"
value="GRADLE"/>
<option name="scriptParameters"
value=""/>
<option name="taskDescriptions">
<list/>
</option>
<option name="taskNames">
<list>
<option value="bootJar"/>
</list>
</option>
<option name="vmOptions"/>
</ExternalSystemSettings>
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<RunAsTest>false</RunAsTest>
<method v="2"/>
</configuration>
</component>
4 changes: 2 additions & 2 deletions api/Main.run.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
value="nebulosa.api.MainKt"/>
<module name="nebulosa.api.main"/>
<option name="PROGRAM_PARAMETERS"
value="--server.port=7000"/>
value="--server.port=7000 --spring.jpa.show-sql=true"/>
<shortenClasspath name="NONE"/>
<method v="2">
<option name="Gradle.BeforeRunTask"
enabled="true"
tasks="build"
externalProjectPath="$PROJECT_DIR$/api"
vmOptions=""
scriptParameters="-Popenapi -x test"/>
scriptParameters="-x test"/>
</method>
</configuration>
</component>
20 changes: 11 additions & 9 deletions api/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@ import org.springframework.boot.gradle.tasks.bundling.BootJar

plugins {
kotlin("jvm")
id("org.springframework.boot") version "3.1.3"
id("org.springframework.boot") version "3.1.4"
id("io.spring.dependency-management") version "1.1.3"
kotlin("plugin.spring")
kotlin("kapt")
id("io.objectbox")
}

dependencies {
Expand All @@ -17,6 +16,7 @@ dependencies {
implementation(project(":nebulosa-horizons"))
implementation(project(":nebulosa-imaging"))
implementation(project(":nebulosa-indi-client"))
implementation(project(":nebulosa-json"))
implementation(project(":nebulosa-lx200-protocol"))
implementation(project(":nebulosa-nova"))
implementation(project(":nebulosa-platesolving-astap"))
Expand All @@ -34,25 +34,27 @@ dependencies {
implementation(libs.eventbus)
implementation(libs.apache.codec)
implementation(libs.rx)
// implementation(libs.sqlite)
runtimeOnly(files("$projectDir/libs/sqlite-jdbc-3.43.0.0.jar"))
implementation(libs.flyway)
implementation("org.springframework.boot:spring-boot-starter")
implementation("org.springframework.boot:spring-boot-starter-web")
implementation("org.springframework.boot:spring-boot-starter-validation")
implementation("org.springframework.boot:spring-boot-starter-websocket")
kapt("org.springframework:spring-context-indexer:6.0.11")
implementation("org.springframework.boot:spring-boot-starter-batch")
implementation("org.springframework.boot:spring-boot-starter-data-jpa")
implementation("org.hibernate.orm:hibernate-community-dialects")
implementation("org.jetbrains.kotlin:kotlin-reflect")
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
kapt("org.springframework:spring-context-indexer:6.0.12")
testImplementation(project(":nebulosa-skycatalog-hyg"))
testImplementation(project(":nebulosa-skycatalog-stellarium"))
testImplementation(project(":nebulosa-test"))

if (project.hasProperty("openapi")) {
implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0")
}
}

tasks.withType<BootJar> {
archiveFileName.set("api.jar")
destinationDirectory.set(file("$rootDir/desktop"))
archiveFileName = "api.jar"
destinationDirectory = file("$rootDir/desktop")

manifest {
attributes["Start-Class"] = "nebulosa.api.MainKt"
Expand Down
2 changes: 2 additions & 0 deletions api/data/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
dsos.json
stars.json
Loading

0 comments on commit 5f669a3

Please sign in to comment.