AGP 8.5.2

syslogic · Aug 9, 2024 · 47d8213 · 47d8213
1 parent 16cfaf0
commit 47d8213
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 18 deletions.
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/gradle.properties b/gradle.properties
@@ -7,5 +7,6 @@ org.gradle.workers.max=6
 org.gradle.parallel=true
 org.gradle.welcome=never
 
-android.enableJetifier=false
 android.useAndroidX=true
+android.enableJetifier=false
+android.suppressUnsupportedCompileSdk=35
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-android_gradle_plugin        = '8.3.2'
+android_gradle_plugin        = '8.5.2'
 kotlin                       = '2.0.0'
 material_design              = '1.12.0'
 retrofit                     = '2.11.0'
@@ -10,7 +10,7 @@ flexbox                      = '3.0.0'
 jgit                         = '6.2.0.202206071550-r'
 slf4j                        = '2.0.13'
 androidx_appcompat           = '1.7.0'
-androidx_annotation          = '1.8.1'
+androidx_annotation          = '1.8.2'
 androidx_navigation          = '2.7.7'
 androidx_fragment            = '1.8.2'
 androidx_recyclerview        = '1.3.2'
@@ -41,6 +41,7 @@ retrofit                     = { module = "com.squareup.retrofit2:retrofit", ver
 retrofit_gson_converter      = { module = "com.squareup.retrofit2:converter-gson", version.ref = "retrofit" }
 jgit                         = { module = "org.eclipse.jgit:org.eclipse.jgit", version.ref = "jgit" }
 slf4j                        = { module = "org.slf4j:slf4j-simple", version.ref = "slf4j" }
+
 androidx_databinding         = { module = "androidx.databinding:databinding-runtime", version.ref = "android_gradle_plugin" }
 androidx_appcompat           = { module = "androidx.appcompat:appcompat", version.ref = "androidx_appcompat" }
 androidx_annotation          = { module = "androidx.annotation:annotation", version.ref = "androidx_annotation" }
@@ -55,11 +56,14 @@ androidx_room_testing        = { module = "androidx.room:room-testing", version.
 androidx_room_compiler       = { module = "androidx.room:room-compiler", version.ref = "androidx_room" }
 androidx_room_runtime        = { module = "androidx.room:room-runtime", version.ref = "androidx_room" }
 androidx_splashscreen        = { module = "androidx.core:core-splashscreen", version.ref = "androidx_splashscreen" }
+
 androidx_test_monitor        = { module = "androidx.test:monitor", version.ref = "androidx_test_monitor" }
 androidx_test_junit          = { module = "androidx.test.ext:junit", version.ref = "androidx_test_junit" }
 androidx_test_core           = { module = "androidx.test:core", version.ref = "androidx_test_core" }
 androidx_test_rules          = { module = "androidx.test:rules", version.ref = "androidx_test_rules" }
 androidx_test_runner         = { module = "androidx.test:runner", version.ref = "androidx_test_runner" }
 androidx_test_uiautomator    = { module = "androidx.test.uiautomator:uiautomator", version.ref = "androidx_test_uiautomator" }
-androidx_espresso_core       = { module = "androidx.test.espresso:espresso-core", version.ref = "androidx_test_espresso" }
-androidx_espresso_web        = { module = "androidx.test.espresso:espresso-web", version.ref = "androidx_test_espresso" }
+androidx_test_espresso_core  = { module = "androidx.test.espresso:espresso-core", version.ref = "androidx_test_espresso" }
+androidx_test_espresso_web   = { module = "androidx.test.espresso:espresso-web", version.ref = "androidx_test_espresso" }
+
+[bundles]
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Mon May 15 03:22:49 CEST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/library/build.gradle b/library/build.gradle
@@ -10,15 +10,18 @@ base {
 
 android {
     namespace 'io.syslogic.github.api'
-    buildToolsVersion = '34.0.0'
-    compileSdk 34
+    buildToolsVersion = '35.0.0'
+    compileSdk 35
     defaultConfig {
         minSdk 22
-        targetSdk 34
+        targetSdk 35
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFile "${project.rootDir}/proguard/consumer.pro"
     }
 
+    sourceSets.main.java.srcDirs = [ "src/main/java" ]
+
+    // Room Plugin
     room {
         schemaDirectory("${rootDir}/schema")
     }
@@ -28,8 +31,6 @@ android {
         targetCompatibility JavaVersion.VERSION_17
     }
 
-    sourceSets.main.java.srcDirs = [ "src/main/java" ]
-
     buildFeatures {
         buildConfig true
         dataBinding true
@@ -137,6 +138,10 @@ tasks.register('javadoc', Javadoc) {
             }
         }
     }
+    doLast {
+        // delete temporary directory.
+        delete project.fileTree('build/tmp7aarsToJars')
+    }
 }
 
 javadoc.onlyIf {

diff --git a/mobile/build.gradle b/mobile/build.gradle
@@ -22,11 +22,11 @@ base {
 
 android {
     namespace 'io.syslogic.github'
-    buildToolsVersion = '34.0.0'
-    compileSdk 34
+    buildToolsVersion = '35.0.0'
+    compileSdk 35
     defaultConfig {
         minSdk 22
-        targetSdk 34
+        targetSdk 35
         applicationId 'io.syslogic.github'
         //noinspection GroovyConstructorNamedArguments
         manifestPlaceholders = [ accessToken: "" ]
@@ -166,7 +166,7 @@ dependencies {
     // api "org.slf4j:slf4j-nop:$slf4j_version"
     api libs.slf4j
 
-    // jUnit
+    // jUnit4
     testImplementation libs.junit
 
     // Required for connected tests.
@@ -186,8 +186,8 @@ dependencies {
     androidTestImplementation libs.androidx.test.uiautomator
 
     // Espresso
-    androidTestImplementation libs.androidx.espresso.core
-    androidTestImplementation libs.androidx.espresso.web
+    androidTestImplementation libs.androidx.test.espresso.core
+    androidTestImplementation libs.androidx.test.espresso.web
     // androidTestImplementation "androidx.test.espresso:espresso-contrib:$androidx_test_espresso_version"
     // androidTestImplementation "androidx.test.espresso:espresso-intents:$androidx_test_espresso_version"
     // androidTestImplementation "androidx.test.espresso:espresso-accessibility:$androidx_test_espresso_version"
@@ -196,5 +196,4 @@ dependencies {
     // The following dependency can be either "implementation" or "androidTestImplementation",
     // depending on whether you want it to appear on your APK's compile classpath or the test APK classpath.
     // androidTestImplementation "androidx.test.espresso:espresso-idling-resource:$androidx_test_espresso_version"
-
 }