Update libs.versions.toml

update dependencies
start 0.20.15
2025-09-17 14:29:24 +00:00 · 2023-11-24 20:14:32 +06:00 · 2023-11-24 16:58:50 +06:00 · 2023-11-24 16:46:22 +06:00 · 2023-11-18 23:27:06 +06:00 · 2023-11-18 18:11:07 +06:00
22 changed files with 133 additions and 68 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,7 +8,7 @@ jobs:
      - uses: actions/checkout@v2
      - uses: actions/setup-java@v1
        with:
-          java-version: 11
+          java-version: 17
      - name: Rewrite version
        run: |
          branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`"
--- a/.github/workflows/dokka_push.yml
+++ b/.github/workflows/dokka_push.yml
@@ -10,7 +10,7 @@ jobs:
      - uses: actions/checkout@v2
      - uses: actions/setup-java@v1
        with:
-          java-version: 11
+          java-version: 17
      - name: Build
        run: ./gradlew build && ./gradlew dokkaHtml
      - name: Publish KDocs
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,39 @@
 # Changelog

+## 0.20.15
+
+* `Versions`:
+    * `Kotlin`: `1.9.20` -> `1.9.21`
+    * `KSLog`: `1.3.0` -> `1.3.1`
+    * `Compose`: `1.5.10` -> `1.5.11`
+
+## 0.20.14
+
+* `Versions`:
+    * `Serialization`: `1.6.0` -> `1.6.1`
+    * `KSLog`: `1.2.4` -> `1.3.0`
+
+## 0.20.13
+
+* `Versions`:
+    * `Ktor`: `2.3.5` -> `2.3.6`
+    * `UUID`: `0.8.1` -> `0.8.2`
+
+## 0.20.12
+
+**It is experimental migration onto new gradle version. Be careful in use of this version**
+
+**This update have JDK 17 in `compatibility` and `target` versions**
+
+## 0.20.11
+
+* `Versions`:
+    * `Kotlin`: `1.9.20-RC2` -> `1.9.20`
+    * `Exposed`: `0.44.0` -> `0.44.1`
+    * `Compose`: `1.5.10-rc02` -> `1.5.10`
+* `Coroutines`:
+    * `SmartRWLocker` now will wait first unlock of write mutex for acquiring read
+
 ## 0.20.10

 * `Versions`:
--- a/coroutines/src/commonMain/kotlin/dev/inmo/micro_utils/coroutines/SmartRWLocker.kt
+++ b/coroutines/src/commonMain/kotlin/dev/inmo/micro_utils/coroutines/SmartRWLocker.kt
@@ -23,6 +23,7 @@ class SmartRWLocker(private val readPermits: Int = Int.MAX_VALUE, writeIsLocked:
     * Do lock in [readSemaphore] inside of [writeMutex] locking
     */
    suspend fun acquireRead() {
+        _writeMutex.waitUnlock()
        _readSemaphore.acquire()
    }

--- a/defaultAndroidSettings.gradle
+++ b/defaultAndroidSettings.gradle
@@ -27,7 +27,7 @@ android {
    }

    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
    }
 }
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,5 +15,5 @@ crypto_js_version=4.1.1
 # Project data

 group=dev.inmo
-version=0.20.10
-android_code_version=216
+version=0.20.15
+android_code_version=221
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,20 +1,19 @@
 [versions]

-kt = "1.9.20-RC2"
-#compose-kotlin = "1.5.10-beta02"
-kt-serialization = "1.6.0"
+kt = "1.9.21"
+kt-serialization = "1.6.1"
 kt-coroutines = "1.7.3"

-kslog = "1.2.2"
+kslog = "1.3.1"

-jb-compose = "1.5.10-rc02"
-jb-exposed = "0.44.0"
+jb-compose = "1.5.11"
+jb-exposed = "0.44.1"
 jb-dokka = "1.9.10"

 korlibs = "4.0.10"
-uuid = "0.8.1"
+uuid = "0.8.2"

-ktor = "2.3.5"
+ktor = "2.3.6"

 gh-release = "2.4.1"

@@ -22,18 +21,18 @@ koin = "3.5.0"

 okio = "3.6.0"

-ksp = "1.9.20-RC2-1.0.13"
-kotlin-poet = "1.14.2"
+ksp = "1.9.20-1.0.14"
+kotlin-poet = "1.15.1"

-versions = "0.49.0"
+versions = "0.50.0"

-android-gradle = "7.4.2"
+android-gradle = "8.1.4"
 dexcount = "4.0.0"

 android-coreKtx = "1.12.0"
 android-recyclerView = "1.3.2"
 android-appCompat = "1.6.1"
-android-fragment = "1.6.1"
+android-fragment = "1.6.2"
 android-espresso = "3.5.1"
 android-test = "1.1.5"
 android-compose-material3 = "1.1.2"
--- 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.6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/jvm.publish.gradle
+++ b/jvm.publish.gradle
@@ -2,11 +2,11 @@ apply plugin: 'maven-publish'

 task javadocJar(type: Jar) {
    from javadoc
-    classifier = 'javadoc'
+    archiveClassifier = 'javadoc'
 }
 task sourcesJar(type: Jar) {
    from sourceSets.main.allSource
-    classifier = 'sources'
+    archiveClassifier = 'sources'
 }

 publishing {
@@ -115,4 +115,10 @@ if (project.hasProperty("signing.gnupg.keyName")) {
            dependsOn(it)
        }
    }
+
+    // Workaround to make android sign operations depend on signing tasks
+    project.getTasks().withType(AbstractPublishToMaven.class).configureEach {
+        def signingTasks = project.getTasks().withType(Sign.class)
+        mustRunAfter(signingTasks)
+    }
 }
--- a/koin/generator/build.gradle
+++ b/koin/generator/build.gradle
@@ -15,6 +15,6 @@ dependencies {
 }

 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
--- a/language_codes/generator/build.gradle
+++ b/language_codes/generator/build.gradle
@@ -26,6 +26,6 @@ dependencies {
 mainClassName="MainKt"

 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
--- a/mppAndroidProject.gradle
+++ b/mppAndroidProject.gradle
@@ -6,6 +6,11 @@ apply from: "$publishGradlePath"
 kotlin {
    androidTarget {
        publishAllLibraryVariants()
+        compilations.all {
+            kotlinOptions {
+                jvmTarget = "17"
+            }
+        }
    }

    sourceSets {
@@ -27,6 +32,6 @@ kotlin {
 apply from: "$defaultAndroidSettingsPresetPath"

 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
--- a/mppJavaProject.gradle
+++ b/mppJavaProject.gradle
@@ -7,7 +7,7 @@ kotlin {
    jvm {
        compilations.main {
            kotlinOptions {
-                jvmTarget = "1.8"
+                jvmTarget = "17"
            }
        }
    }
@@ -35,6 +35,6 @@ kotlin {
 }

 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
--- a/mppJvmJsAndroidLinuxMingwLinuxArm64Project.gradle
+++ b/mppJvmJsAndroidLinuxMingwLinuxArm64Project.gradle
@@ -7,7 +7,7 @@ kotlin {
    jvm {
        compilations.main {
            kotlinOptions {
-                jvmTarget = "1.8"
+                jvmTarget = "17"
            }
        }
    }
@@ -17,6 +17,11 @@ kotlin {
    }
    androidTarget {
        publishAllLibraryVariants()
+        compilations.all {
+            kotlinOptions {
+                jvmTarget = "17"
+            }
+        }
    }
    linuxX64()
    mingwX64()
@@ -61,6 +66,6 @@ kotlin {
 apply from: "$defaultAndroidSettingsPresetPath"

 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
--- a/mppJvmJsAndroidProject.gradle
+++ b/mppJvmJsAndroidProject.gradle
@@ -7,7 +7,7 @@ kotlin {
    jvm {
        compilations.main {
            kotlinOptions {
-                jvmTarget = "1.8"
+                jvmTarget = "17"
            }
        }
    }
@@ -17,6 +17,11 @@ kotlin {
    }
    androidTarget {
        publishAllLibraryVariants()
+        compilations.all {
+            kotlinOptions {
+                jvmTarget = "17"
+            }
+        }
    }
    linuxX64()
    mingwX64()
@@ -71,6 +76,6 @@ kotlin {
 apply from: "$defaultAndroidSettingsPresetPath"

 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
--- a/mppJvmJsLinuxMingwLinuxArm64Project.gradle
+++ b/mppJvmJsLinuxMingwLinuxArm64Project.gradle
@@ -7,7 +7,7 @@ kotlin {
    jvm {
        compilations.main {
            kotlinOptions {
-                jvmTarget = "1.8"
+                jvmTarget = "17"
            }
        }
    }
@@ -49,6 +49,6 @@ kotlin {
 }

 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
--- a/mppJvmJsLinuxMingwProject.gradle
+++ b/mppJvmJsLinuxMingwProject.gradle
@@ -7,7 +7,7 @@ kotlin {
    jvm {
        compilations.main {
            kotlinOptions {
-                jvmTarget = "1.8"
+                jvmTarget = "17"
            }
        }
    }
@@ -60,6 +60,6 @@ kotlin {
 }

 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
--- a/mppProjectWithSerializationAndCompose.gradle
+++ b/mppProjectWithSerializationAndCompose.gradle
@@ -7,7 +7,7 @@ kotlin {
    jvm {
        compilations.main {
            kotlinOptions {
-                jvmTarget = "1.8"
+                jvmTarget = "17"
            }
        }
    }
@@ -17,6 +17,11 @@ kotlin {
    }
    androidTarget {
        publishAllLibraryVariants()
+        compilations.all {
+            kotlinOptions {
+                jvmTarget = "17"
+            }
+        }
    }

    sourceSets {
@@ -70,8 +75,8 @@ kotlin {
 apply from: "$defaultAndroidSettingsPresetPath"

 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }


--- a/publish.gradle
+++ b/publish.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'maven-publish'

 task javadocsJar(type: Jar) {
-    classifier = 'javadoc'
+    archiveClassifier = 'javadoc'
 }

 publishing {
@@ -70,6 +70,7 @@ publishing {
                    authentication {
                        header(HttpHeaderAuthentication)
                    }
+            
                }
            }
            if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
@@ -102,4 +103,10 @@ if (project.hasProperty("signing.gnupg.keyName")) {
            dependsOn(it)
        }
    }
+
+    // Workaround to make android sign operations depend on signing tasks
+    project.getTasks().withType(AbstractPublishToMaven.class).configureEach {
+        def signingTasks = project.getTasks().withType(Sign.class)
+        mustRunAfter(signingTasks)
+    }
 }
--- a/repos/generator/build.gradle
+++ b/repos/generator/build.gradle
@@ -16,6 +16,6 @@ dependencies {
 }

 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
--- a/settings.gradle
+++ b/settings.gradle
@@ -59,5 +59,3 @@ includes.each { originalName ->
    project.name = projectName
    project.projectDir = new File(projectDirectory)
 }
-
-enableFeaturePreview("VERSION_CATALOGS")
--- a/startup/launcher/build.gradle
+++ b/startup/launcher/build.gradle
@@ -28,8 +28,8 @@ application {
 }

 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }

 dependencies {
Author	SHA1	Message	Date
InsanusMokrassar	eefb56bed7	Update libs.versions.toml	2023-11-24 20:14:32 +06:00
InsanusMokrassar	fcc0dc4189	update dependencies	2023-11-24 16:58:50 +06:00
InsanusMokrassar	47ff20317f	start 0.20.15	2023-11-24 16:46:22 +06:00
InsanusMokrassar	1558b9103d	Merge pull request #343 from InsanusMokrassar/0.20.14 0.20.14	2023-11-18 23:27:06 +06:00
InsanusMokrassar	7a78742162	update kslog	2023-11-18 18:11:07 +06:00
InsanusMokrassar	c01e240f66	update dependencies	2023-11-18 15:40:12 +06:00
InsanusMokrassar	fef4fcbac6	start 0.20.14	2023-11-18 15:37:19 +06:00
InsanusMokrassar	5ab18bce4b	Merge pull request #335 from InsanusMokrassar/0.20.13 0.20.13	2023-11-11 16:37:11 +06:00
InsanusMokrassar	24aec7271a	update dependencies and changelog	2023-11-11 16:30:59 +06:00
InsanusMokrassar	9b19a2cb95	Update libs.versions.toml	2023-11-10 04:29:38 +06:00
InsanusMokrassar	efdd7b8a57	Update libs.versions.toml	2023-11-10 04:28:54 +06:00
InsanusMokrassar	6df4cc9c3b	start 0.20.13	2023-11-06 21:12:28 +06:00
InsanusMokrassar	b9d93db0f5	Merge pull request #334 from InsanusMokrassar/0.20.12 0.20.12	2023-11-02 19:16:56 +06:00
InsanusMokrassar	d7ee45ca64	update github workflows	2023-11-02 19:01:00 +06:00
InsanusMokrassar	d7c31b1b22	update and fix build	2023-11-02 19:00:35 +06:00
InsanusMokrassar	7d6794a358	start 0.20.12	2023-11-02 18:26:15 +06:00
InsanusMokrassar	473eb87346	Merge pull request #330 from InsanusMokrassar/0.20.11 0.20.11	2023-11-01 12:38:44 +06:00
InsanusMokrassar	8b18b07790	Update CHANGELOG.md	2023-11-01 12:37:30 +06:00
InsanusMokrassar	ab3c80a5ec	update dependencies	2023-10-31 17:53:56 +06:00
InsanusMokrassar	075b93ecd6	SmartRWLocker now will wait first unlock of write mutex for acquiring read	2023-10-26 12:28:24 +06:00
InsanusMokrassar	f6d0f72e49	start 0.20.11	2023-10-26 12:28:04 +06:00
InsanusMokrassar	fcda3af862	Merge pull request #329 from InsanusMokrassar/0.20.10 0.20.10	2023-10-26 10:51:45 +06:00