Merge pull request #132 from yamasa/master

Update Android SDK and library versions.

.github/workflows/ci.yml

@@ -26,6 +26,7 @@ jobs:
         run: ./gradlew assemble test
 
   android-test:
+    if: ${{ false }}  # Disable for now: https://github.com/line/lich/issues/131
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v2

component-compose/build.gradle

@@ -25,7 +25,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.compose.get()
+        kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
     }
 }
 

gradle/libs.versions.toml

@@ -1,35 +1,36 @@
 [versions]
-compileSdk = "31"
-targetSdk = "31"
-androidGradlePlugin = "7.1.2"
-androidLint = "30.1.2"
-androidMaterial = "1.5.0"
-kotlin = "1.6.10"
-kotlinCoroutines = "1.6.0"
-kotlinMetadataJvm = "0.4.2"
-ksp = "1.6.10-1.0.4"
-compose = "1.1.1"
-androidxActivity = "1.4.0"
-androidxAppcompat = "1.4.1"
-androidxConstraintlayout = "2.1.3"
-androidxFragment = "1.4.1"
-androidxLifecycle = "2.4.1"
-androidxNavigation = "2.4.1"
-androidxRoom = "2.4.2"
+compileSdk = "32"
+targetSdk = "32"
+androidGradlePlugin = "7.2.2"
+androidLint = "30.2.2"
+androidMaterial = "1.6.1"
+kotlin = "1.7.10"
+kotlinCoroutines = "1.6.4"
+kotlinMetadataJvm = "0.5.0"
+ksp = "1.7.10-1.0.6"
+compose = "1.2.0"
+composeCompiler = "1.3.0-rc02"
+androidxActivity = "1.5.1"
+androidxAppcompat = "1.4.2"
+androidxConstraintlayout = "2.1.4"
+androidxFragment = "1.5.1"
+androidxLifecycle = "2.5.1"
+androidxNavigation = "2.5.1"
+androidxRoom = "2.4.3"
 androidxTestCore = "1.4.0"
 androidxTestRunner = "1.4.0"
 androidxTestJunit = "1.1.3"
 androidxTestEspresso = "3.4.0"
 autoService = "1.0.1"
 autoServiceKsp = "1.0.0"
-okhttp = "4.9.3"
-kotlinpoet = "1.10.2"
+okhttp = "4.10.0"
+kotlinpoet = "1.12.0"
 thrift = "0.16.0"
-dexmaker = "2.28.1"
-mockito = "4.4.0"
+dexmaker = "2.28.3"
+mockito = "4.6.1"
 mockitoKotlin = "4.0.0"
-mockk = "1.12.3"
-robolectric = "4.7.3"
+mockk = "1.12.5"
+robolectric = "4.8.1"
 nexusStaging = "0.30.0"
 
 [libraries]
@@ -64,6 +65,7 @@ compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling", versi
 compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview", version.ref = "compose" }
 
 # androidxActivity
+androidx-activity = { group = "androidx.activity", name = "activity", version.ref = "androidxActivity" }
 androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "androidxActivity" }
 
 # androidxAppcompat

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -205,6 +205,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,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,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 +75,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

savedstate/build.gradle

@@ -24,14 +24,9 @@ android {
 
 dependencies {
     api libs.androidx.lifecycle.viewmodel.savedstate
+    implementation libs.androidx.activity
     compileOnly libs.androidx.fragment
     lintPublish project(':static-analysis')
-    // https://github.com/line/lich/issues/114
-    constraints {
-        implementation(libs.androidx.lifecycle.viewmodel.ktx) {
-            because 'lifecycle-viewmodel-ktx:2.3 conflicts with lifecycle-viewmodel:2.4+'
-        }
-    }
 
     kspAndroidTest project(':savedstate-compiler')
     androidTestImplementation libs.bundles.test.instrumentation

viewmodel-compose/build.gradle

@@ -25,7 +25,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.compose.get()
+        kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
     }
 }
 

viewmodel/build.gradle

@@ -25,15 +25,10 @@ android {
 dependencies {
     api libs.kotlin.coroutines.android
     api libs.androidx.lifecycle.viewmodel.savedstate
+    implementation libs.androidx.activity
     compileOnly libs.androidx.fragment
     compileOnly libs.androidx.navigation.fragment
     lintPublish project(':static-analysis')
-    // https://github.com/line/lich/issues/114
-    constraints {
-        implementation(libs.androidx.lifecycle.viewmodel.ktx) {
-            because 'lifecycle-viewmodel-ktx:2.3 conflicts with lifecycle-viewmodel:2.4+'
-        }
-    }
 
     androidTestImplementation project(':savedstate')
     kspAndroidTest project(':savedstate-compiler')