refactor: Bump AGP from 7.1.3 to 8.5.2

parse-community · Aug 17, 2024 · c70eb11 · c70eb11
1 parent 8cf87b3
commit c70eb11
Show file tree

Hide file tree

Showing 12 changed files with 87 additions and 51 deletions.
diff --git a/bolts-tasks/build.gradle b/bolts-tasks/build.gradle
@@ -18,12 +18,13 @@ java {
 
 javadoc.options.addStringOption('Xdoclint:none', '-quiet')
 
-task sourcesJar(type: Jar) {
+tasks.register('sourcesJar', Jar) {
     archiveClassifier.set('sources')
     from sourceSets.main.allJava
 }
 
-task javadocJar(type: Jar, dependsOn: javadoc) {
+tasks.register('javadocJar', Jar) {
+    dependsOn javadoc
     archiveClassifier.set('javadoc')
     from javadoc.destinationDir
 }
@@ -39,7 +40,7 @@ afterEvaluate {
     publishing {
         publications {
             boltsPublication(MavenPublication) {
-                from components.java
+                from components.findByName('java')
             }
         }
     }
@@ -55,8 +56,8 @@ jacocoTestReport {
     group = "Reporting"
     description = "Generate Jacoco coverage reports after running tests."
     reports {
-        xml.enabled true
-        html.enabled true
+        xml { enabled true }
+        html { enabled true }
     }
 }
 

diff --git a/build.gradle b/build.gradle
@@ -7,10 +7,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.3'
+        classpath 'com.android.tools.build:gradle:8.5.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "org.jacoco:org.jacoco.core:$jacocoVersion"
-        classpath "com.dicedmelon.gradle:jacoco-android:0.1.5"
         classpath "io.freefair.gradle:android-gradle-plugins:4.2.0-m1"
         classpath "com.diffplug.spotless:spotless-plugin-gradle:$spotlessVersion"
     }

diff --git a/coroutines/build.gradle b/coroutines/build.gradle
@@ -5,7 +5,8 @@ apply plugin: "io.freefair.android-javadoc-jar"
 apply plugin: "io.freefair.android-sources-jar"
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
+    namespace 'com.parse.coroutines'
+    compileSdk rootProject.ext.compileSdkVersion
 
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
@@ -37,6 +38,10 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+
+    buildFeatures {
+        buildConfig true
+    }
 }
 
 ext {
@@ -54,7 +59,7 @@ afterEvaluate {
     publishing {
         publications {
             release(MavenPublication) {
-                from components.release
+                from components.findByName('release')
             }
         }
     }

diff --git a/facebook/build.gradle b/facebook/build.gradle
@@ -4,7 +4,8 @@ apply plugin: "io.freefair.android-javadoc-jar"
 apply plugin: "io.freefair.android-sources-jar"
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
+    namespace 'com.parse.facebook'
+    compileSdk rootProject.ext.compileSdkVersion
 
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
@@ -32,6 +33,10 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
+    buildFeatures {
+        buildConfig true
+    }
 }
 
 dependencies {
@@ -48,7 +53,7 @@ afterEvaluate {
     publishing {
         publications {
             release(MavenPublication) {
-                from components.release
+                from components.findByName('release')
             }
         }
     }

diff --git a/fcm/build.gradle b/fcm/build.gradle
@@ -4,7 +4,8 @@ apply plugin: "io.freefair.android-javadoc-jar"
 apply plugin: "io.freefair.android-sources-jar"
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
+    namespace 'com.parse.fcm'
+    compileSdk rootProject.ext.compileSdkVersion
 
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
@@ -33,6 +34,9 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
+    buildFeatures {
+        buildConfig true
+    }
 }
 
 dependencies {
@@ -44,7 +48,7 @@ afterEvaluate {
     publishing {
         publications {
             release(MavenPublication) {
-                from components.release
+                from components.findByName('release')
             }
         }
     }

diff --git a/google/build.gradle b/google/build.gradle
@@ -5,7 +5,8 @@ apply plugin: "io.freefair.android-javadoc-jar"
 apply plugin: "io.freefair.android-sources-jar"
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
+    namespace 'com.parse.google'
+    compileSdk rootProject.ext.compileSdkVersion
 
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
@@ -37,6 +38,10 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+
+    buildFeatures {
+        buildConfig true
+    }
 }
 
 dependencies {
@@ -51,7 +56,7 @@ afterEvaluate {
     publishing {
         publications {
             release(MavenPublication) {
-                from components.release
+                from components.findByName('release')
             }
         }
     }

diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,4 @@
 version = 4.3.0
 android.enableJetifier = true
 android.useAndroidX = true
+org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Apr 16 09:27:50 CEST 2022
+#Thu Aug 15 20:11:31 GST 2024
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/ktx/build.gradle b/ktx/build.gradle
@@ -5,7 +5,8 @@ apply plugin: "io.freefair.android-javadoc-jar"
 apply plugin: "io.freefair.android-sources-jar"
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
+    namespace 'com.parse.ktx'
+    compileSdk rootProject.ext.compileSdkVersion
 
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
@@ -38,6 +39,10 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+
+    buildFeatures {
+        buildConfig true
+    }
 }
 
 dependencies {
@@ -49,7 +54,7 @@ afterEvaluate {
     publishing {
         publications {
             release(MavenPublication) {
-                from components.release
+                from components.findByName('release')
             }
         }
     }

diff --git a/parse/build.gradle b/parse/build.gradle
@@ -4,7 +4,8 @@ apply plugin: "io.freefair.android-javadoc-jar"
 apply plugin: "io.freefair.android-sources-jar"
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
+    namespace 'com.parse'
+    compileSdk rootProject.ext.compileSdkVersion
 
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
@@ -15,6 +16,18 @@ android {
     testOptions {
         unitTests {
             includeAndroidResources = true
+
+            all {
+                // Configure JaCoCo options
+                jacoco {
+                    includeNoLocationClasses = true
+                    excludes.add("jdk.internal.*")
+                }
+                // Configure test logging
+                testLogging {
+                    events("failed")
+                }
+            }
         }
     }
 
@@ -25,20 +38,24 @@ android {
     buildTypes {
         debug {
             testCoverageEnabled = true
-            buildConfigField("String","PARSE_VERSION","\"${version}\"")
+            buildConfigField("String", "PARSE_VERSION", "\"${version}\"")
         }
         release {
             minifyEnabled false
             testCoverageEnabled = false
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
-            buildConfigField("String","PARSE_VERSION","\"${version}\"")
+            buildConfigField("String", "PARSE_VERSION", "\"${version}\"")
         }
     }
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
+    buildFeatures {
+        buildConfig true
+    }
 }
 
 ext {
@@ -65,38 +82,23 @@ afterEvaluate {
     publishing {
         publications {
             release(MavenPublication) {
-                from components.release
+                from components.findByName('release')
             }
         }
     }
 }
 
 //endregion
 
-//region Code Coverage
-
-apply plugin: "com.dicedmelon.gradle.jacoco-android"
-
-jacoco {
-    toolVersion = rootProject.ext.jacocoVersion
-}
-
-tasks.withType(Test) {
-    jacoco.includeNoLocationClasses = true
-    jacoco.excludes = ['jdk.internal.*']
-    testLogging {
-        events "failed"
+tasks.withType(JacocoReport).configureEach {
+    jacoco.toolVersion = rootProject.ext.jacocoVersion
+    reports {
+        csv.required.set(false)
+        html.required.set(true)
+        xml.required.set(true)
     }
 }
 
-tasks.withType(Test) {
+tasks.withType(Test).configureEach {
     useJUnitPlatform()
 }
-
-jacocoAndroidUnitTestReport {
-    csv.enabled false
-    html.enabled true
-    xml.enabled true
-}
-
-//endregion
diff --git a/rxjava/build.gradle b/rxjava/build.gradle
@@ -6,7 +6,8 @@ apply plugin: "io.freefair.android-sources-jar"
 
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
+    namespace 'com.parse.rxjava'
+    compileSdk rootProject.ext.compileSdkVersion
 
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
@@ -38,6 +39,10 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+
+    buildFeatures {
+        buildConfig true
+    }
 }
 
 dependencies {
@@ -50,7 +55,7 @@ afterEvaluate {
     publishing {
         publications {
             release(MavenPublication) {
-                from components.release
+                from components.findByName('release')
             }
         }
     }

diff --git a/twitter/build.gradle b/twitter/build.gradle
@@ -4,7 +4,8 @@ apply plugin: "io.freefair.android-javadoc-jar"
 apply plugin: "io.freefair.android-sources-jar"
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
+    namespace 'com.parse.twitter'
+    compileSdk rootProject.ext.compileSdkVersion
 
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
@@ -32,6 +33,10 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
+    buildFeatures {
+        buildConfig true
+    }
 }
 
 dependencies {
@@ -48,7 +53,7 @@ afterEvaluate {
     publishing {
         publications {
             release(MavenPublication) {
-                from components.release
+                from components.findByName('release')
             }
         }
     }