Push works

cccp-education · Oct 5, 2024 · 7beb68c · 7beb68c
1 parent 077a1af
commit 7beb68c
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 16 deletions.
diff --git a/api/build.gradle.kts b/api/build.gradle.kts
@@ -162,12 +162,12 @@ configurations {
  }
 }
 
-java { sourceCompatibility = VERSION_21 }
+//java { sourceCompatibility = VERSION_21 }
 
 tasks.withType<KotlinCompile> {
  kotlinOptions {
  freeCompilerArgs = listOf("-Xjsr305=strict")
- jvmTarget = VERSION_21.toString()
+// jvmTarget = VERSION_21.toString()
  }
 }
 

diff --git a/base/core.py → base/base.py b/base/core.py → base/base.py
diff --git a/base/build.gradle.kts b/base/build.gradle.kts
@@ -1,11 +1,15 @@
+import java.util.*
+
 plugins {
  // Apply the org.jetbrains.kotlin.jvm Plugin to add support for Kotlin.
  alias(libs.plugins.kotlin.jvm)
 
  // Apply the java-library plugin for API and implementation separation.
  `java-library`
 }
-version = "0.0.1"
+
+version = project.artifactVersion
+
 repositories {
  // Use Maven Central for resolving dependencies.
  mavenCentral()
@@ -33,7 +37,23 @@ dependencies {
 // }
 //}
 
-tasks.named<Test>("test") {
- // Use JUnit Platform for unit tests.
- useJUnitPlatform()
+tasks.named<Test>("test") { useJUnitPlatform() }
+
+tasks.register<DefaultTask>("displayBaseProperties") {
+ doFirst {
+ project.artifactVersion
+ .run { "BASE VERSION : $this" }
+ .run(::println)
+ }
 }
+
+val Project.artifactVersion: String
+ get() = Properties().apply {
+ "artifact.version.key"
+ .run(properties::get)
+ .run { "${"user.home".run(System::getProperty)}$this" }
+ .run(::File)
+ .inputStream()
+ .use(::load)
+ }["artifact.version"].toString()
+
diff --git a/base/gradle.properties b/base/gradle.properties
@@ -1,7 +1,10 @@
+free_compiler_args_value=-Xjsr305=strict
+commons_email.version=1.5
+jib.version=3.1.4
 workspace_path=workspace.yml
-#kotlin.daemon.jvmargs=-Xmx1024
 artifact.group=school
-artifact.version=0.0.1
+artifact.version=
+artifact.version.key=/workspace/school/gradle.properties
 kotlin.version=2.0.0
 kotlin.code.style=official
 kotlin.mpp.enableGranularSourceSetsMetadata=true
@@ -44,8 +47,3 @@ arrow-kt_jackson.version=0.14.1
 node-gradle.version=7.0.2
 jbake-gradle.version=5.5.0
 kotlinx-serialization-json.version=1.7.2
-#docker_registry=
-#docker_hub_login=
-#docker_hub_email=
-#docker_hub_password=
-#docker_hub_login_token=
diff --git a/base/gradle/libs.versions.toml b/base/gradle/libs.versions.toml
@@ -1,6 +1,3 @@
-# This file was generated by the Gradle 'init' task.
-# https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format
-
 [versions]
 commons-math3 = "3.6.1"
 guava = "33.2.1-jre"