Gradle 8 updates

dimagi · Mar 18, 2024 · df47768 · df47768
1 parent a79691b
commit df47768
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 5 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -215,6 +215,7 @@ static def getDate() {
 }
 
 android {
+    namespace "org.commcare.dalvik"
     compileSdkVersion 33
 
     lintOptions {
@@ -236,6 +237,10 @@ android {
         exclude 'META-INF/NOTICE.txt'
     }
 
+    buildFeatures {
+        buildConfig true
+    }
+
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 33

diff --git a/app/jacoco.gradle b/app/jacoco.gradle
@@ -13,8 +13,8 @@ android {
 
 task jacocoTestReport(type: JacocoReport, dependsOn: ['testCommcareDebugUnitTest']) {
     reports {
-        xml.enabled = true
-        html.enabled = true
+        xml.required = true
+        html.required = true
     }
     def fileFilter = ['**/R.class',
                       '**/R$*.class',

diff --git a/build.gradle b/build.gradle
@@ -7,11 +7,11 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.1'
+        classpath 'com.android.tools.build:gradle:8.0.1'
         classpath 'com.google.gms:google-services:4.3.14'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'org.jacoco:org.jacoco.core:0.8.8'
+        classpath 'org.jacoco:org.jacoco.core:0.8.10'
         classpath 'com.vanniktech:gradle-maven-publish-plugin:0.15.1'
     }
 }

diff --git a/commcare-support-library/build.gradle b/commcare-support-library/build.gradle
@@ -39,6 +39,7 @@ afterEvaluate {
 }
 
 android {
+    namespace "org.commcare.commcaresupportlibrary"
     compileSdk 33
     defaultConfig {
         minSdkVersion 21
@@ -51,6 +52,12 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    publishing {
+        singleVariant("release") {
+            withSourcesJar()
+            withJavadocJar()
+        }
+    }
 }
 
 dependencies {

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri Feb 10 10:17:15 SAST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME