fix(ci): use JDK 17

.github/workflows/android-master.yml

@@ -13,38 +13,33 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  check_wrapper:
-    name: Validate Gradle Wrapper
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Clone repo
-        uses: actions/checkout@v2
-
-      - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v1
-
   build:
     name: Build project
-    needs: check_wrapper
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
+
+      - name: Validate Gradle Wrapper
+        uses: gradle/wrapper-validation-action@v2
 
       - name: Copy CI gradle.properties
         run: |
           mkdir -p ~/.gradle
           cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Set up JDK
+        uses: actions/setup-java@v2
         with:
-          java-version: 11
+          java-version: 17
+          distribution: adopt
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
 
       - name: Build APK
-        run: bash ./gradlew spotlessCheck assembleRelease --stacktrace
+        run: ./gradlew spotlessCheck assembleRelease --stacktrace
 
       - name: Sign APK
         if: github.repository == 'ivaniskandar/shouko' && github.event_name == 'push'

app/build.gradle

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
@@ -68,7 +70,7 @@ android {
         buildTypes.debug.signingConfig signingConfigs.debug
     }
 
-    applicationVariants.all { variant ->
+    applicationVariants.configureEach { variant ->
         variant.outputs.each { output ->
             output.versionNameOverride "$versionName-$gitCommitHash"
         }
@@ -79,7 +81,7 @@ dependencies {
     implementation 'androidx.core:core-ktx:1.12.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.activity:activity-compose:1.8.2'
-    implementation "androidx.navigation:navigation-compose:2.8.0-alpha04"
+    implementation "androidx.navigation:navigation-compose:2.8.0-alpha05"
     implementation "com.github.topjohnwu.libsu:core:5.0.4"
     implementation 'com.squareup.logcat:logcat:0.1'
     implementation 'com.google.android.gms:play-services-oss-licenses:17.0.1'
@@ -131,7 +133,7 @@ protobuf {
     }
 }
 
-tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
+tasks.withType(KotlinCompile).configureEach {
     kotlinOptions {
         freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
         freeCompilerArgs += "-opt-in=androidx.compose.material.ExperimentalMaterialApi"

app/src/main/java/xyz/ivaniskandar/shouko/activity/MainActivity.kt

@@ -17,7 +17,7 @@ import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.sizeIn
 import androidx.compose.material.ModalBottomSheetValue
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.rounded.ArrowBack
+import androidx.compose.material.icons.automirrored.rounded.ArrowBack
 import androidx.compose.material.icons.rounded.MoreVert
 import androidx.compose.material.rememberModalBottomSheetState
 import androidx.compose.material3.CenterAlignedTopAppBar
@@ -54,7 +54,6 @@ import androidx.navigation.compose.rememberNavController
 import com.google.accompanist.navigation.material.BottomSheetNavigator
 import com.google.accompanist.navigation.material.ModalBottomSheetLayout
 import com.google.accompanist.navigation.material.bottomSheet
-import com.google.accompanist.navigation.material.rememberBottomSheetNavigator
 import com.google.android.gms.oss.licenses.OssLicensesMenuActivity
 import kotlinx.coroutines.launch
 import logcat.LogPriority
@@ -128,7 +127,7 @@ class MainActivity : ComponentActivity() {
                                 navigationIcon = if (currentRoute != null && currentRoute != Screen.Home.route) {
                                     {
                                         IconButton(onClick = { navController.popBackStack() }) {
-                                            Icon(imageVector = Icons.Rounded.ArrowBack, contentDescription = null)
+                                            Icon(imageVector = Icons.AutoMirrored.Rounded.ArrowBack, contentDescription = null)
                                         }
                                     }
                                 } else { {} },

app/src/main/java/xyz/ivaniskandar/shouko/ui/component/SoftDivider.kt

@@ -1,6 +1,6 @@
 package xyz.ivaniskandar.shouko.ui.component
 
-import androidx.compose.material3.Divider
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
@@ -9,7 +9,7 @@ import androidx.compose.ui.Modifier
 fun SoftDivider(
     modifier: Modifier = Modifier,
 ) {
-    Divider(
+    HorizontalDivider(
         modifier = modifier,
         color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.12F),
     )

app/src/main/java/xyz/ivaniskandar/shouko/ui/destination/AndroidAppLink.kt

@@ -19,7 +19,7 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Launch
+import androidx.compose.material.icons.automirrored.filled.Launch
 import androidx.compose.material.icons.outlined.Info
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.ButtonDefaults
@@ -359,7 +359,7 @@ fun LinkTargetInfoSheet(
                 .padding(top = 24.dp, bottom = 8.dp),
         ) {
             Icon(
-                Icons.Default.Launch,
+                Icons.AutoMirrored.Filled.Launch,
                 contentDescription = null,
                 modifier = Modifier.size(ButtonDefaults.IconSize),
             )

build.gradle

@@ -1,9 +1,9 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext {
-        kotlin_version = "1.9.22"
-        compose_bom_version = '2024.03.00-alpha01'
-        compose_compiler_version = '1.5.10'
+        kotlin_version = "1.9.23"
+        compose_bom_version = '2024.03.00-alpha02'
+        compose_compiler_version = '1.5.11'
         protobuf_version = '3.25.3'
     }
     repositories {
@@ -12,7 +12,7 @@ buildscript {
         maven { url 'https://jitpack.io' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.3.0'
+        classpath 'com.android.tools.build:gradle:8.3.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.google.android.gms:oss-licenses-plugin:0.10.6'
         classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.16.0'

gradle.properties

@@ -15,7 +15,5 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # Android operating system, and which are packaged with your app"s APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
-# Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Tue Mar 07 12:57:38 ICT 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

settings.gradle

@@ -6,5 +6,6 @@ dependencyResolutionManagement {
         maven { url 'https://jitpack.io' }
     }
 }
+
 rootProject.name = "XPERI+"
 include ':app'