bump

.gitignore

@@ -1,12 +1,7 @@
 *.iml
 .gradle
 /local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
+/.idea
 .DS_Store
 /build
 /captures

app/build.gradle.kts

@@ -22,9 +22,13 @@ val keystoreProperties = if (keystorePropertiesFile.exists() && keystoreProperti
 var verCode: Int by rootProject.extra
 var verName: String by rootProject.extra
 
+kotlin {
+    jvmToolchain(21)
+}
+
 android {
     namespace = "io.github.a13e300.ro_tieba"
-    compileSdk = 34
+    compileSdk = 35
 
     signingConfigs {
         if (keystoreProperties != null) {
@@ -40,7 +44,7 @@ android {
     defaultConfig {
         applicationId = "io.github.a13e300.ro_tieba"
         minSdk = 27
-        targetSdk = 34
+        targetSdk = 35
         versionCode = verCode
         versionName = verName
 
@@ -66,11 +70,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "21"
     }
     buildFeatures {
         viewBinding = true
@@ -112,9 +116,6 @@ dependencies {
     implementation(libs.navigation.ui.ktx)
     implementation(libs.legacy.support.v4)
     implementation(libs.recyclerview)
-    testImplementation(libs.junit)
-    androidTestImplementation(libs.androidx.test.ext.junit)
-    androidTestImplementation(libs.espresso.core)
     implementation(libs.protobuf.kotlin)
     implementation(libs.protobuf.java)
     implementation(libs.bundles.rikkax)
@@ -154,12 +155,3 @@ protobuf {
         }
     }
 }
-
-// https://github.com/google/ksp/issues/1288#issuecomment-1510633127
-allprojects {
-    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-        kotlinOptions {
-            jvmTarget = JavaVersion.VERSION_1_8.toString()
-        }
-    }
-}

app/src/main/java/io/github/a13e300/ro_tieba/ui/thread/ThreadFragment.kt

@@ -22,7 +22,6 @@ import android.widget.MediaController
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.view.MenuProvider
-import androidx.core.view.ViewCompat
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.core.widget.doAfterTextChanged
@@ -339,7 +338,7 @@ class ThreadFragment : BaseFragment() {
                 null -> return
             }
             updateBar(binding.includeThreadBar)
-            ViewCompat.postOnAnimation(binding.mainStickyContainerLayout) {
+            binding.mainStickyContainerLayout.postOnAnimation {
                 binding.mainStickyContainerLayout.isGone = shouldHide
             }
         }

app/src/main/java/io/github/a13e300/ro_tieba/utils/Utils.kt

@@ -51,6 +51,7 @@ import java.util.Date
 import javax.net.ssl.SSLContext
 import javax.net.ssl.TrustManager
 import javax.net.ssl.X509TrustManager
+import kotlin.collections.removeLast as removeLastKt
 
 fun ByteArray.toHexString() = this.joinToString("") {
     String.format("%02x", it)
@@ -117,7 +118,7 @@ fun List<PbContentOuterClass.PbContent>.toPostContent(): List<Content> {
                 if (last == null)
                     Content.TextContent(item.text)
                 else {
-                    result.removeLast()
+                    result.removeLastKt()
                     Content.TextContent(last.text + item.text)
                 }
             }

gradle/libs.versions.toml

@@ -1,27 +1,25 @@
 [versions]
-com-android-application = "8.2.2"
-datastore = "1.0.0"
-gson = "2.10.1"
+agp = "8.8.0"
+datastore = "1.1.2"
+gson = "2.12.1"
 okhttp = "4.12.0"
-kotlin = "1.9.23"
-ksp = "1.9.22-1.0.18"
-core-ktx = "1.12.0"
+kotlin = "2.1.10"
+ksp = "2.1.10-1.0.29"
+core-ktx = "1.15.0"
 junit = "4.13.2"
-androidx-test-ext-junit = "1.1.5"
-espresso-core = "3.5.1"
-appcompat = "1.6.1"
-material = "1.11.0"
-constraintlayout = "2.1.4"
-lifecycle-livedata-ktx = "2.7.0"
-lifecycle-viewmodel-ktx = "2.7.0"
-navigation = "2.7.7"
+appcompat = "1.7.0"
+material = "1.12.0"
+constraintlayout = "2.2.0"
+lifecycle-livedata-ktx = "2.8.7"
+lifecycle-viewmodel-ktx = "2.8.7"
+navigation = "2.8.6"
 
-paging-runtime = "3.2.1"
+paging-runtime = "3.3.5"
 preference = "1.2.1"
-protobuf = "4.26.0"
+protobuf = "4.29.3"
 retrofit = "2.9.0"
 legacy-support-v4 = "1.0.0"
-recyclerview = "1.3.2"
+recyclerview = "1.4.0"
 room-runtime = "2.6.1"
 sketch = "3.3.1"
 zoom-image = "1.0.2"
@@ -62,18 +60,14 @@ recyclerview = { group = "androidx.recyclerview", name = "recyclerview", version
 rikkax-insets = "dev.rikka.rikkax.insets:insets:1.3.0"
 rikkax-layoutinflater = "dev.rikka.rikkax.layoutinflater:layoutinflater:1.3.0"
 
-junit = { group = "junit", name = "junit", version.ref = "junit" }
-androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidx-test-ext-junit" }
-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso-core" }
-
 sketch-main = { module = "io.github.panpf.sketch3:sketch", version.ref = "sketch" }
 sketch-okhttp = { module = "io.github.panpf.sketch3:sketch-okhttp", version.ref = "sketch" }
 sketch-zoom = { module = "io.github.panpf.zoomimage:zoomimage-view-sketch", version.ref = "zoom-image" }
 sketch-movie = { module = "io.github.panpf.sketch3:sketch-gif-movie", version.ref = "sketch" }
 sketch-extension = { module = "io.github.panpf.sketch3:sketch-extensions", version.ref = "sketch" }
 
 [plugins]
-com-android-application = { id = "com.android.application", version.ref = "com-android-application" }
+com-android-application = { id = "com.android.application", version.ref = "agp" }
 org-jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 protobuf = { id = "com.google.protobuf", version = "0.9.4" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Wed May 10 10:00:56 CST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle.kts

@@ -1,9 +1,5 @@
 pluginManagement {
     repositories {
-        maven { setUrl("https://maven.aliyun.com/repository/central") }
-        maven { setUrl("https://maven.aliyun.com/repository/google") }
-        maven { setUrl("https://maven.aliyun.com/repository/gradle-plugin") }
-        maven { setUrl("https://maven.aliyun.com/repository/public") }
         google()
         mavenCentral()
         gradlePluginPortal()
@@ -12,12 +8,6 @@ pluginManagement {
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
-        /*
-        maven { setUrl("https://maven.aliyun.com/repository/central") }
-        maven { setUrl("https://maven.aliyun.com/repository/google") }
-        maven { setUrl("https://maven.aliyun.com/repository/gradle-plugin") }
-        maven { setUrl("https://maven.aliyun.com/repository/public") }
-        */
         google()
         mavenCentral()
     }