Merge pull request #17 from crowdproj/feature/version-update

Feature/version update
crowdproj · Sep 25, 2023 · e1c1cc4 · e1c1cc4
2 parents bfc9c3b + 246466f
commit e1c1cc4
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 25 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -24,10 +24,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
 
 #      - uses: actions/checkout@v2

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -19,10 +19,10 @@ jobs:
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
       - name: Validate Gradle wrapper
         uses: gradle/wrapper-validation-action@v1

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -22,10 +22,10 @@ jobs:
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
       - name: Validate Gradle wrapper
         uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 }
 
 group = "com.crowdproj"
-version = "0.5.5"
+version = "0.5.6"
 
 repositories {
     mavenCentral()
@@ -24,13 +24,13 @@ nexusStaging {
 }
 
 kotlin {
-    js(BOTH) {
+    js {
         browser()
         nodejs()
     }
     jvm()
     linuxX64()
-//    linuxArm64()
+    linuxArm64()
 //    linuxArm32Hfp()
 //    linuxMips32()
 //    linuxMipsel32()
@@ -48,7 +48,6 @@ kotlin {
     watchosArm32()
     watchosSimulatorArm64()
     watchosArm64()
-    watchosX86()
     watchosX64()
 //    wasm()
 //    wasm32()
@@ -61,15 +60,13 @@ kotlin {
 
         all { languageSettings.optIn("kotlin.RequiresOptIn") }
 
-        @Suppress("UNUSED_VARIABLE")
         val commonMain by getting {
             dependencies {
                 implementation(kotlin("stdlib-common"))
                 implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion")
             }
         }
 
-        @Suppress("UNUSED_VARIABLE")
         val commonTest by getting {
             dependencies {
                 implementation(kotlin("test-common"))
@@ -79,28 +76,24 @@ kotlin {
             }
         }
 
-        @Suppress("UNUSED_VARIABLE")
         val jsMain by getting {
             dependencies {
                 implementation(kotlin("stdlib-js"))
             }
         }
 
-        @Suppress("UNUSED_VARIABLE")
         val jsTest by getting {
             dependencies {
                 implementation(kotlin("test-js"))
             }
         }
 
-        @Suppress("UNUSED_VARIABLE")
         val jvmMain by getting {
             dependencies {
                 implementation(kotlin("stdlib-jdk8"))
             }
         }
 
-        @Suppress("UNUSED_VARIABLE")
         val jvmTest by getting {
             dependencies {
                 implementation(kotlin("test-junit5"))
@@ -109,14 +102,12 @@ kotlin {
             }
         }
 
-        @Suppress("UNUSED_VARIABLE")
         val linuxX64Main by getting {
             dependencies {
                 implementation(kotlin("stdlib"))
             }
         }
 
-        @Suppress("UNUSED_VARIABLE")
         val linuxX64Test by getting {
             dependencies {
                 implementation(kotlin("test"))

diff --git a/gradle.properties b/gradle.properties
@@ -1,8 +1,9 @@
 org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m
-kotlinVersion=1.7.10
+kotlinVersion=1.9.10
+dokkaVersion=1.8.20
 
-coroutinesVersion=1.6.3
-atomicfuVersion=0.18.3
+coroutinesVersion=1.7.3
+atomicfuVersion=0.21.0
 nexusStagingVersion=0.30.0
 
 #  -native-mt
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -3,11 +3,12 @@ rootProject.name = "kotlin-cor"
 pluginManagement {
     plugins {
         val kotlinVersion: String by settings
+        val dokkaVersion: String by settings
         val nexusStagingVersion: String by settings
 
         kotlin("multiplatform") version kotlinVersion
         `maven-publish`
-        id("org.jetbrains.dokka") version kotlinVersion
+        id("org.jetbrains.dokka") version dokkaVersion
         id("io.codearte.nexus-staging") version nexusStagingVersion
     }
 }
diff --git a/src/commonTest/kotlin/subChain/SubChainSequentialTest.kt b/src/commonTest/kotlin/subChain/SubChainSequentialTest.kt
@@ -65,7 +65,7 @@ class SubChainSequentialTest {
                     text = ""
                     str.map { TestSubContext(str = it.toString(), parent = this) }.asFlow()
                 }
-                worker("") { delay(100); str += "_w1" }
+                worker("") { delay(200); str += "_w1" }
                 worker("") { delay(20); str += "_w2" }
                 join {
                     text += it.str
@@ -81,7 +81,7 @@ class SubChainSequentialTest {
                     str.map { TestSubContext(str = it.toString(), parent = this) }.asFlow()
                 }
                 worker("") { println("START: $str") }
-                worker("") { val del = 100 - str.toLong() * 10; println("$str $del"); delay(del); str += ";" }
+                worker("") { val del = 200 - str.toLong() * 20; println("$str $del"); delay(del); str += ";" }
                 worker("") { parent.atomicText.update { it + str } }
                 worker("") { println("STOP: $str") }
             }