Bump dependencies, Use Java 17, Add namespace for Gradle 8

annotation/build.gradle

@@ -5,12 +5,15 @@ plugins {
 }
 
 android {
-    compileSdkVersion target_sdk
+    namespace "rikka.annotation"
+    compileSdk target_sdk
+
     defaultConfig {
-        minSdkVersion 14
-        targetSdkVersion target_sdk
+        minSdk 14
+        targetSdk target_sdk
         versionCode 1
         versionName rikka_annotation_version
+
         consumerProguardFiles 'consumer-rules.pro'
     }
     buildTypes {

annotation/src/main/AndroidManifest.xml

@@ -1 +1 @@
-<manifest package="rikka.annotation" />
+<manifest />

appcompat/build.gradle

@@ -7,17 +7,19 @@ plugins {
 }
 
 android {
-    compileSdkVersion target_sdk
+    namespace "androidx.appcompat"
+    compileSdk target_sdk
+
     defaultConfig {
-        minSdkVersion 23
-        targetSdkVersion target_sdk
+        minSdk 23
+        targetSdk target_sdk
         versionCode 1
         versionName '1.6.1'
         consumerProguardFiles 'consumer-rules.pro'
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     defaultConfig {
         // This disables the builds tools automatic vector -> PNG generation
@@ -36,25 +38,23 @@ android {
 }
 
 dependencies {
-    api("androidx.annotation:annotation:1.3.0")
-    api("androidx.core:core:1.9.0")
+    api("androidx.annotation:annotation:$androidx_annotation_version")
+    api("androidx.core:core:$androidx_core_version")
     // Required to make activity 1.5.0-rc01 dependencies resolve.
-    implementation("androidx.core:core-ktx:1.8.0")
-    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.8.0")
-    implementation("androidx.emoji2:emoji2:1.2.0")
-    implementation("androidx.emoji2:emoji2-views-helper:1.2.0")
-    implementation("androidx.collection:collection:1.0.0")
+    implementation("androidx.core:core-ktx:$androidx_core_version")
+    implementation("androidx.emoji2:emoji2:1.5.0")
+    implementation("androidx.emoji2:emoji2-views-helper:1.5.0")
+    implementation("androidx.collection:collection:1.4.4")
     api("androidx.cursoradapter:cursoradapter:1.0.0")
-    api("androidx.activity:activity:1.6.0")
-    api("androidx.fragment:fragment:1.3.6")
-    api("androidx.appcompat:appcompat-resources:1.6.1")
-    api("androidx.drawerlayout:drawerlayout:1.0.0")
-    implementation("androidx.lifecycle:lifecycle-runtime:2.5.1")
-    implementation("androidx.lifecycle:lifecycle-viewmodel:2.5.1")
+    api("androidx.activity:activity:$androidx_activity_version")
+    api("androidx.fragment:fragment:$androidx_fragment_version")
+    api("androidx.appcompat:appcompat-resources:$androidx_appcompat_version")
+    api("androidx.drawerlayout:drawerlayout:1.2.0")
+    implementation("androidx.lifecycle:lifecycle-runtime:$androidx_lifecycle_version")
+    implementation("androidx.lifecycle:lifecycle-viewmodel:$androidx_lifecycle_version")
     implementation("androidx.resourceinspection:resourceinspection-annotation:1.0.1")
-    api("androidx.savedstate:savedstate:1.2.0")
+    api("androidx.savedstate:savedstate:1.2.1")
     // Due to experimental annotations used in core.
-    compileOnly("org.jetbrains.kotlin:kotlin-stdlib:1.8.0")
     kapt("androidx.resourceinspection:resourceinspection-annotation:1.0.1")
 }
 

appcompat/src/main/AndroidManifest.xml

@@ -13,4 +13,4 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<manifest package="androidx.appcompat"/>
+<manifest />

build.gradle

@@ -12,8 +12,8 @@ buildscript {
 }
 
 plugins {
-    id 'com.android.application' version '7.4.2' apply false
-    id 'com.android.library' version '7.4.2' apply false
+    id 'com.android.application' version '8.7.0' apply false
+    id 'com.android.library' version '8.7.0' apply false
     id 'org.jetbrains.kotlin.jvm' version '2.0.20' apply false
 }
 
@@ -103,7 +103,3 @@ subprojects {
         }
     }
 }
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}

buildcompat/build.gradle

@@ -5,14 +5,14 @@ plugins {
 }
 
 android {
-    compileSdkVersion target_sdk
+    namespace "rikka.buildcompat"
+    compileSdk target_sdk
+
     defaultConfig {
-        minSdkVersion 14
-        targetSdkVersion target_sdk
+        minSdk 14
+        targetSdk target_sdk
         versionCode 1
         versionName '34.0.1'
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildFeatures {
         buildConfig false
@@ -24,17 +24,13 @@ android {
         }
     }
     compileOptions {
-        targetCompatibility 1.8
-        sourceCompatibility 1.8
+        targetCompatibility 17
+        sourceCompatibility 17
     }
 }
 
 dependencies {
     implementation "androidx.annotation:annotation:$androidx_annotation_version"
-
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test:runner:1.4.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 }
 
 ext {

buildcompat/src/main/AndroidManifest.xml

@@ -1 +1 @@
-<manifest package="rikka.buildcompat"/>
+<manifest />

compatibility/build.gradle

@@ -5,14 +5,14 @@ plugins {
 }
 
 android {
-    compileSdkVersion target_sdk
+    namespace "rikka.compatibility"
+    compileSdk target_sdk
+
     defaultConfig {
-        minSdkVersion 14
-        targetSdkVersion target_sdk
+        minSdk 14
+        targetSdk target_sdk
         versionCode 1
         versionName '2.0.0'
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildFeatures {
         buildConfig false
@@ -24,19 +24,15 @@ android {
         }
     }
     compileOptions {
-        targetCompatibility 1.8
-        sourceCompatibility 1.8
+        targetCompatibility 17
+        sourceCompatibility 17
     }
 }
 
 dependencies {
     implementation "androidx.annotation:annotation:$androidx_annotation_version"
     compileOnly project(':stub')
     implementation project(':lazy')
-
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test:runner:1.4.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 }
 
 ext {

compatibility/src/main/AndroidManifest.xml

@@ -1 +1 @@
-<manifest package="rikka.compatibility"/>
+<manifest />

core/core-ktx/build.gradle

@@ -6,12 +6,15 @@ plugins {
 }
 
 android {
-    compileSdkVersion target_sdk
+    namespace "rikka.core.ktx"
+    compileSdk target_sdk
+
     defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion target_sdk
+        minSdk 21
+        targetSdk target_sdk
         versionCode 1
         versionName rikka_core_version
+
         consumerProguardFiles 'consumer-rules.pro'
     }
     buildTypes {
@@ -21,8 +24,8 @@ android {
         }
     }
     compileOptions {
-        targetCompatibility 1.8
-        sourceCompatibility 1.8
+        targetCompatibility 17
+        sourceCompatibility 17
     }
 }
 

core/core-ktx/src/main/AndroidManifest.xml

@@ -1 +1 @@
-<manifest package="rikka.core.ktx" />
+<manifest />

core/core/build.gradle

@@ -5,12 +5,15 @@ plugins {
 }
 
 android {
-    compileSdkVersion target_sdk
+    namespace "rikka.core"
+    compileSdk target_sdk
+
     defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion target_sdk
+        minSdk 21
+        targetSdk target_sdk
         versionCode 1
         versionName rikka_core_version
+
         consumerProguardFiles 'consumer-rules.pro'
     }
     buildTypes {
@@ -20,8 +23,8 @@ android {
         }
     }
     compileOptions {
-        targetCompatibility 1.8
-        sourceCompatibility 1.8
+        targetCompatibility 17
+        sourceCompatibility 17
     }
 }
 

core/core/src/main/AndroidManifest.xml

@@ -1 +1 @@
-<manifest package="rikka.core" />
+<manifest />

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,7 @@
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

html/html-ktx/build.gradle

@@ -6,14 +6,15 @@ plugins {
 }
 
 android {
-    compileSdkVersion target_sdk
+    namespace "rikka.html.ktx"
+    compileSdk target_sdk
+
     defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion target_sdk
+        minSdk 21
+        targetSdk target_sdk
         versionCode 1
         versionName rikka_html_version
 
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
     }
     buildFeatures {
@@ -26,8 +27,8 @@ android {
         }
     }
     compileOptions {
-        targetCompatibility 1.8
-        sourceCompatibility 1.8
+        targetCompatibility 17
+        sourceCompatibility 17
     }
 }
 

html/html-ktx/src/main/AndroidManifest.xml

@@ -1 +1 @@
-<manifest package="rikka.html.ktx"/>
+<manifest />

html/html/build.gradle

@@ -5,14 +5,15 @@ plugins {
 }
 
 android {
-    compileSdkVersion target_sdk
+    namespace "rikka.html"
+    compileSdk target_sdk
+
     defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion target_sdk
+        minSdk 21
+        targetSdk target_sdk
         versionCode 1
         versionName rikka_html_version
 
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
     }
     buildFeatures {
@@ -25,18 +26,14 @@ android {
         }
     }
     compileOptions {
-        targetCompatibility 1.8
-        sourceCompatibility 1.8
+        targetCompatibility 17
+        sourceCompatibility 17
     }
 }
 
 dependencies {
     implementation "org.ccil.cowan.tagsoup:tagsoup:1.2"
     implementation "androidx.annotation:annotation:$androidx_annotation_version"
-
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test:runner:1.3.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 }
 
 ext {

html/html/src/main/AndroidManifest.xml

@@ -1 +1 @@
-<manifest package="rikka.html"/>
+<manifest />

insets/build.gradle

@@ -6,12 +6,15 @@ plugins {
 }
 
 android {
-    compileSdkVersion target_sdk
+    namespace "rikka.insets"
+    compileSdk target_sdk
+
     defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion target_sdk
+        minSdk 21
+        targetSdk target_sdk
         versionCode 1
         versionName '1.3.0'
+
         consumerProguardFiles 'consumer-rules.pro'
     }
     buildTypes {
@@ -21,8 +24,8 @@ android {
         }
     }
     compileOptions {
-        targetCompatibility 1.8
-        sourceCompatibility 1.8
+        targetCompatibility 17
+        sourceCompatibility 17
     }
 }
 

insets/src/main/AndroidManifest.xml

@@ -1 +1 @@
-<manifest package="rikka.insets" />
+<manifest />