Update dependencies (#3)

Co-authored-by: kiri <[email protected]>

.github/workflows/main.yml

@@ -17,6 +17,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 17
 
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
@@ -32,4 +36,3 @@ jobs:
           PACKAGES_REPOSITORY: https://maven.pkg.github.com/${{ github.repository }}
           PACKAGES_USERNAME: ${{ github.actor }}
           PACKAGES_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-

build.gradle

@@ -12,12 +12,12 @@ buildscript {
 }
 
 plugins {
-    id 'com.palantir.git-version' version '0.12.3'
+    id 'com.palantir.git-version' version '3.0.0'
 }
 
 allprojects {
     group = "com.bridge.ouroboros.compose"
-    version = "${gitVersion()}"
+    version gitVersion()
 }
 
 subprojects {

buildSrc/src/main/kotlin/com/ouroboros/dependencies.kt

@@ -1,20 +1,19 @@
 package com.ouroboros
 
 object Libs {
-    const val androidGradlePlugin = "com.android.tools.build:gradle:7.2.2"
+    const val androidGradlePlugin = "com.android.tools.build:gradle:8.1.1"
 
     const val junit = "junit:junit:4.13"
 
     const val material = "com.google.android.material:material:1.4.0"
 
     object Kotlin {
-        const val version = "1.6.10"
-        const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version"
+        private const val version = "1.9.10"
         const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
     }
 
     object Coroutines {
-        private const val version = "1.6.4"
+        private const val version = "1.7.3"
         const val core = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$version"
         const val android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$version"
         const val test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$version"
@@ -29,23 +28,24 @@ object Libs {
     }
 
     object Kotest {
-        private const val version = "5.4.2"
+        private const val version = "5.6.0"
         const val assertions = "io.kotest:kotest-assertions-core:$version"
     }
 
     object MockK {
-        private const val version = "1.12.5"
+        private const val version = "1.13.3"
         const val library = "io.mockk:mockk:$version"
     }
 
     object AndroidX {
-        const val appcompat = "androidx.appcompat:appcompat:1.3.1"
+        const val appcompat = "androidx.appcompat:appcompat:1.5.0"
 
-        const val activityCompose = "androidx.activity:activity-compose:1.3.1"
-        const val navigationCompose = "androidx.navigation:navigation-compose:2.5.1"
+        const val activityCompose = "androidx.activity:activity-compose:1.6.1"
+        const val navigationCompose = "androidx.navigation:navigation-compose:2.5.3"
 
         object Compose {
-            const val version = "1.1.1"
+            const val version = "1.5.1"
+            const val compiler = "1.5.3"
 
             const val runtime = "androidx.compose.runtime:runtime:$version"
             const val foundation = "androidx.compose.foundation:foundation:${version}"
@@ -56,7 +56,7 @@ object Libs {
         }
 
         object Test {
-            private const val version = "1.4.0"
+            private const val version = "1.5.0"
             const val core = "androidx.test:core:$version"
             const val rules = "androidx.test:rules:$version"
 
@@ -67,10 +67,10 @@ object Libs {
         }
 
         object Lifecycle {
-            private const val version = "2.3.1"
+            private const val version = "2.6.1"
             const val extensions = "androidx.lifecycle:lifecycle-extensions:$version"
             const val viewmodel = "androidx.lifecycle:lifecycle-viewmodel-ktx:$version"
-            const val viewmodelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:2.4.0"
+            const val viewmodelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:$version"
         }
     }
 }

core/build.gradle

@@ -10,11 +10,13 @@ plugins {
 }
 
 android {
-    compileSdk 33
+    namespace = "com.bridge.ouroboros.compose"
+
+    compileSdk 34
 
     defaultConfig {
         minSdk 21
-        targetSdk 33
+        targetSdk 34
     }
 
     buildTypes {
@@ -29,20 +31,20 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     buildFeatures {
         compose true
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion Libs.AndroidX.Compose.version
+        kotlinCompilerExtensionVersion Libs.AndroidX.Compose.compiler
     }
 
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
         allWarningsAsErrors = true
     }
 
@@ -52,7 +54,6 @@ android {
 }
 
 dependencies {
-    api Libs.Kotlin.stdlib
     api Libs.Coroutines.core
     api Libs.Coroutines.android
 
@@ -74,4 +75,4 @@ afterEvaluate {
             }
         }
     }
-}
+}

example-app/build.gradle

@@ -11,12 +11,14 @@ plugins {
 }
 
 android {
-    compileSdk 32
+    namespace = "com.bridge.ouroboros.exampleapplication"
+
+    compileSdk 34
 
     defaultConfig {
         applicationId "com.bridge.ouroboros.exampleapplication"
         minSdk 21
-        targetSdk 32
+        targetSdk 34
         versionCode 1
         versionName "1.0"
 
@@ -38,16 +40,16 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion Libs.AndroidX.Compose.version
+        kotlinCompilerExtensionVersion Libs.AndroidX.Compose.compiler
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = '11'
+        jvmTarget = '17'
         allWarningsAsErrors = true
 
         freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
@@ -77,7 +79,6 @@ dependencies {
     implementation Libs.Ktor.contentNegotiation
     implementation Libs.Ktor.json
 
-    api Libs.Kotlin.stdlib
     api Libs.Coroutines.android
 
     implementation Libs.AndroidX.activityCompose
@@ -91,4 +92,4 @@ dependencies {
     testImplementation project(':test')
 
     androidTestImplementation Libs.AndroidX.Test.Ext.junit
-}
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
+#Thu Jul 13 10:33:09 CEST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -143,12 +140,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in
@@ -205,6 +210,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

test/build.gradle

@@ -8,11 +8,13 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 31
+    namespace = "com.bridge.ouroboros.compose.test"
+
+    compileSdkVersion 33
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 31
+        targetSdkVersion 33
     }
 
     buildTypes {
@@ -27,12 +29,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
         allWarningsAsErrors = true
     }
 
@@ -43,7 +45,7 @@ android {
 
 dependencies {
     api project(':core')
-    implementation 'io.kotest:kotest-assertions-core:5.1.0'
+    implementation 'io.kotest:kotest-assertions-core:5.6.0'
 }
 
 afterEvaluate {
@@ -58,4 +60,4 @@ afterEvaluate {
             }
         }
     }
-}
+}