feat(android): update support libraries (#13473)

* gradle update * downgrade agp * keep target/compile sdk * put version name/code back in
tidev · Jun 20, 2022 · 2958575 · 2958575
1 parent 58852ca
commit 2958575
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -16,6 +16,7 @@ buildscript {
 		classpath 'com.android.tools.build:gradle:7.0.4'
 		classpath 'com.google.gms:google-services:4.3.10'
 		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+		classpath 'org.codehaus.groovy:groovy-json:3.0.11'
 	}
 }
 
@@ -29,7 +30,7 @@ allprojects {
 	project.apply plugin: 'checkstyle'
 	checkstyle {
 		toolVersion = '8.38'
-		configFile file("${rootDir}/checkstyle.xml");
+		configFile file("${rootDir}/checkstyle.xml")
 		ignoreFailures false
 		showViolations true
 	}

diff --git a/android/templates/build/root.build.gradle b/android/templates/build/root.build.gradle
@@ -7,7 +7,7 @@ buildscript {
 		mavenCentral()
 	}
 	dependencies {
-		classpath 'com.android.tools.build:gradle:7.0.4'
+		classpath 'com.android.tools.build:gradle:7.2.0'
 		classpath 'com.google.gms:google-services:4.3.10'
 		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 	}

diff --git a/android/templates/build/ti.constants.gradle b/android/templates/build/ti.constants.gradle
@@ -6,10 +6,10 @@
  */
 
 project.ext {
-	tiAndroidXAppCompatLibVersion = '1.4.1'
-	tiAndroidXCoreLibVersion = '1.7.0'
+	tiAndroidXAppCompatLibVersion = '1.4.2'
+	tiAndroidXCoreLibVersion = '1.8.0'
 	tiAndroidXFragmentLibVersion = '1.4.1'
-	tiMaterialLibVersion = '1.5.0'
+	tiMaterialLibVersion = '1.6.1'
 	tiPlayServicesBaseLibVersion = '18.0.1'
 	tiManifestPlaceholders = [
 		tiActivityConfigChanges: 'density|fontScale|keyboard|keyboardHidden|layoutDirection|locale|mcc|mnc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|touchscreen|uiMode'

diff --git a/android/titanium/AndroidManifest.xml b/android/titanium/AndroidManifest.xml
@@ -30,9 +30,5 @@
 			android:exported="false"
 			android:grantUriPermissions="true"/>
 
-		<service
-			android:name="com.appcelerator.aps.APSAnalyticsService"
-			android:permission="android.permission.BIND_JOB_SERVICE"
-			android:exported="false"/>
 	</application>
 </manifest>
diff --git a/android/titanium/build.gradle b/android/titanium/build.gradle
@@ -1,3 +1,6 @@
+import com.android.build.gradle.tasks.ExternalNativeCleanTask
+import groovy.json.JsonSlurper
+
 /**
  * TiDev Titanium Mobile
  * Copyright TiDev, Inc. 04/07/2022-Present
@@ -12,7 +15,7 @@ apply plugin: 'maven-publish'
 // Prefer environment variables assigned via build/package scripts under "titanium_mobile/build" folder.
 def tiBuildVersionString = System.env.TI_SDK_BUILD_VERSION
 if (tiBuildVersionString == null) {
-	def packageJson = new groovy.json.JsonSlurper().parse(file("${projectDir}/../../package.json"))
+	def packageJson = new JsonSlurper().parse(file("${projectDir}/../../package.json"))
 	tiBuildVersionString = packageJson.version
 	if (tiBuildVersionString == null) {
 		tiBuildVersionString = '1.0.0'
@@ -123,7 +126,7 @@ android {
 
 // Downloads/extracts V8 library and creates a cmake file for it. To be executed before C/C++ "build" or "clean".
 task updateV8Library() {
-	def packageJson = new groovy.json.JsonSlurper().parse(file("${projectDir}/../package.json"))
+	def packageJson = new JsonSlurper().parse(file("${projectDir}/../package.json"))
 	def v8MakeFilePath = "${projectDir}/../runtime/v8/src/ndk-modules/libv8/V8Settings.cmake"
 	inputs.property 'v8.version', packageJson.v8.version
 	inputs.property 'v8.mode', packageJson.v8.mode
@@ -149,7 +152,7 @@ task updateV8Library() {
 	}
 }
 preBuild.dependsOn updateV8Library
-tasks.withType(com.android.build.gradle.tasks.ExternalNativeCleanTask) {
+tasks.withType(ExternalNativeCleanTask) {
 	dependsOn updateV8Library
 }
 
@@ -250,23 +253,23 @@ dependencies {
 	implementation 'androidx.drawerlayout:drawerlayout:1.1.1'
 	implementation 'androidx.exifinterface:exifinterface:1.3.3'
 	implementation "androidx.fragment:fragment:${project.ext.tiAndroidXFragmentLibVersion}"
-	implementation 'androidx.media:media:1.5.0'
+	implementation 'androidx.media:media:1.6.0'
 	implementation 'androidx.recyclerview:recyclerview:1.2.1'
 	implementation 'androidx.recyclerview:recyclerview-selection:1.1.0'
 	implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
 	implementation 'androidx.transition:transition:1.4.1'
 	implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
 	implementation 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
 	implementation 'androidx.viewpager:viewpager:1.0.0'
-	compileOnly 'androidx.annotation:annotation:1.2.0'
+	compileOnly 'androidx.annotation:annotation:1.3.0'
 
 	// Google's "Material Components" themed UI library.
 	implementation "com.google.android.material:material:${project.ext.tiMaterialLibVersion}"
 
 	// The Google Play Services libraries are only used by Titanium's geolocation feature.
 	// We link to them dynamically at runtime. So, they can be safely excluded when in the app project.
 	implementation "com.google.android.gms:play-services-base:${project.ext.tiPlayServicesBaseLibVersion}"
-	implementation 'com.google.android.gms:play-services-location:18.0.0'
+	implementation 'com.google.android.gms:play-services-location:19.0.1'
 
 	// XML library providing XPath support to our Ti.XML APIs.
 	implementation 'jaxen:jaxen:1.2.0'