Merge branch 'main' into renovate/com.android.library-8.x

JuulLabs · Sep 8, 2023 · 479f98a · 479f98a
2 parents b768f78 + 7954037
commit 479f98a
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 8 deletions.
diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
@@ -9,7 +9,7 @@ env:
 
 jobs:
   deploy:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v3

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@ android-compile = "31"
 coroutines = "1.7.3"
 jacoco = "0.8.7"
 jvm-toolchain = "8"
-kotlin = "1.8.22"
+kotlin = "1.9.0"
 ktor = "2.3.2"
 
 [libraries]
@@ -12,7 +12,7 @@ androidx-startup = { module = "androidx.startup:startup-runtime", version = "1.1
 kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
 kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
-kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version = "0.4.0" }
+kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version = "0.4.1" }
 ktor-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
 ktor-logging = { module = "io.ktor:ktor-client-logging", version.ref = "ktor" }
 ktor-mock = { module = "io.ktor:ktor-client-mock", version.ref = "ktor" }
@@ -22,6 +22,6 @@ android-library = { id = "com.android.library", version = "8.1.0" }
 android-publish = { id = "com.vanniktech.maven.publish", version = "0.25.3" }
 atomicfu = { id = "kotlinx-atomicfu", version = "0.21.0" }
 binary-compatibility-validator = { id = "binary-compatibility-validator", version = "0.13.0" }
-dokka = { id = "org.jetbrains.dokka", version = "1.8.20" }
+dokka = { id = "org.jetbrains.dokka", version = "1.9.0" }
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
-kotlinter = { id = "org.jmailen.kotlinter", version = "3.15.0" }
+kotlinter = { id = "org.jmailen.kotlinter", version = "3.16.0" }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

diff --git a/logging/api/logging.api b/logging/api/logging.api
@@ -110,6 +110,7 @@ public final class com/juul/tuulbox/logging/LogLevel : java/lang/Enum {
 	public static final field Info Lcom/juul/tuulbox/logging/LogLevel;
 	public static final field Verbose Lcom/juul/tuulbox/logging/LogLevel;
 	public static final field Warn Lcom/juul/tuulbox/logging/LogLevel;
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;
 	public static fun valueOf (Ljava/lang/String;)Lcom/juul/tuulbox/logging/LogLevel;
 	public static fun values ()[Lcom/juul/tuulbox/logging/LogLevel;
 }
@@ -137,6 +138,7 @@ public final class com/juul/tuulbox/logging/Sensitivity : java/lang/Enum {
 	public static final field Companion Lcom/juul/tuulbox/logging/Sensitivity$Companion;
 	public static final field NotSensitive Lcom/juul/tuulbox/logging/Sensitivity;
 	public static final field Sensitive Lcom/juul/tuulbox/logging/Sensitivity;
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;
 	public static fun valueOf (Ljava/lang/String;)Lcom/juul/tuulbox/logging/Sensitivity;
 	public static fun values ()[Lcom/juul/tuulbox/logging/Sensitivity;
 }

diff --git a/logging/build.gradle.kts b/logging/build.gradle.kts
@@ -25,6 +25,7 @@ kotlin {
     sourceSets {
         all {
             languageSettings.optIn("com.juul.tuulbox.logging.TuulboxInternal")
+            languageSettings.optIn("kotlinx.cinterop.ExperimentalForeignApi")
         }
 
         val commonMain by getting

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -27,7 +27,7 @@ pluginManagement {
 plugins {
     // Provides repositories for auto-downloading JVM toolchains.
     // https://github.com/gradle/foojay-toolchains
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.6.0"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
 }
 
 include(

diff --git a/temporal/build.gradle.kts b/temporal/build.gradle.kts
@@ -32,6 +32,10 @@ kotlin {
     }
 
     sourceSets {
+        all {
+            languageSettings.optIn("kotlinx.cinterop.ExperimentalForeignApi")
+        }
+
         val commonMain by getting {
             dependencies {
                 api(libs.kotlinx.coroutines.core)

diff --git a/test/build.gradle.kts b/test/build.gradle.kts
@@ -19,6 +19,10 @@ kotlin {
     iosSimulatorArm64()
 
     sourceSets {
+        all {
+            languageSettings.optIn("kotlinx.cinterop.ExperimentalForeignApi")
+        }
+
         val commonMain by getting {
             dependencies {
                 api(kotlin("test-common"))