all: update agp 8.7.3 and remove sonar

BatchLabs · Dec 6, 2024 · 8f06062 · 8f06062
1 parent 9a45633
commit 8f06062
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 60 deletions.
diff --git a/Makefile b/Makefile
@@ -17,14 +17,6 @@ test-coverage:
 	./gradlew testDebugCoverageUnitTest && \
     awk -F"," '{ instructions += $$4 + $$5; covered += $$5 } END { print covered, "/", instructions, "instructions covered"; print "Total", 100*covered/instructions "% covered" }' mixpanel-dispatcher/build/test-results/jacoco.csv
 
-check-token:
-ifndef SONAR_TOKEN
-	$(error SONAR_TOKEN is undefined)
-endif
-
-sonar: check-token
-	./gradlew sonarqube
-
 lint:
 	./gradlew lintDebug
 
@@ -33,4 +25,4 @@ ci: clean lint test-coverage aar
 publish: aar
 	./gradlew mixpanel-dispatcher:publish
 
-.PHONY: ci sonar check-token
+.PHONY: ci
diff --git a/build.gradle b/build.gradle
@@ -3,11 +3,10 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.0'
-        classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.8'
+        classpath 'com.android.tools.build:gradle:8.7.3'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -16,8 +15,8 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
         mavenLocal()
+        mavenCentral()
     }
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
diff --git a/mixpanel-dispatcher/build.gradle b/mixpanel-dispatcher/build.gradle
@@ -7,11 +7,11 @@ ext {
 }
 
 android {
-    compileSdkVersion 30
+    namespace "com.batch.android.dispatcher.mixpanel"
+    compileSdk 35
 
     defaultConfig {
-        minSdkVersion 15
-        targetSdkVersion 30
+        minSdkVersion 21
         versionCode 2
         versionName "2.0.0"
 
@@ -54,5 +54,4 @@ dependencies {
 }
 
 apply from: 'maven-publish.gradle'
-apply from: 'jacoco.gradle'
-apply from: 'sonar.gradle'
+apply from: 'jacoco.gradle'
diff --git a/mixpanel-dispatcher/sonar.gradle b/mixpanel-dispatcher/sonar.gradle
diff --git a/mixpanel-dispatcher/src/main/AndroidManifest.xml b/mixpanel-dispatcher/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest package="com.batch.android.dispatcher.mixpanel"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
         <service