More fixes

a-maurice · a-maurice · commit 15a7a67d5df1 · 2024-09-19T18:33:30.000-07:00
diff --git a/android_build_files/extract_and_dex.gradle b/android_build_files/extract_and_dex.gradle
@@ -58,15 +58,15 @@ def defineExtractionTasks(String resourceName, String buildType) {
       outputs.file "$outPro"
 
       // Convert the jar format using the dx tool.
-      String dex_path = "${sdk_dir}/build-tools/${buildToolsVersion}/dx"
+      String dex_path = "${sdk_dir}/build-tools/${buildToolsVersion}/d8"
       if (org.gradle.internal.os.OperatingSystem.current().isWindows()) {
         dex_path = "${dex_path}.bat"
       }
       
       commandLine "${dex_path}",
-          '--dex',
-          "--output=$dexedJar",
-          "$buildDir/classes.jar"
+          "$buildDir/classes.jar",
+          "--output",
+          "$dexedJar"
     }
 
     // Once the dexed jar has been made, generate a proguard file for it.
diff --git a/app/app_resources/build.gradle b/app/app_resources/build.gradle
@@ -37,6 +37,7 @@ android {
     targetCompatibility JavaVersion.VERSION_11
   }
   compileSdkVersion 34
+  buildToolsVersion '32.0.0'
 
   sourceSets {
     main {
diff --git a/app/google_api_resources/build.gradle b/app/google_api_resources/build.gradle
@@ -37,6 +37,7 @@ android {
     targetCompatibility JavaVersion.VERSION_11
   }
   compileSdkVersion 34
+  buildToolsVersion '32.0.0'
 
   sourceSets {
     main {
diff --git a/app/invites_resources/build.gradle b/app/invites_resources/build.gradle
@@ -37,6 +37,7 @@ android {
     targetCompatibility JavaVersion.VERSION_11
   }
   compileSdkVersion 34
+  buildToolsVersion '32.0.0'
 
   sourceSets {
     main {
diff --git a/app/test_resources/build.gradle b/app/test_resources/build.gradle
@@ -33,6 +33,7 @@ apply plugin: 'com.android.library'
 
 android {
   compileSdkVersion 34
+  buildToolsVersion '32.0.0'
 
   sourceSets {
     main {
diff --git a/app_check/app_check_resources/build.gradle b/app_check/app_check_resources/build.gradle
@@ -37,6 +37,7 @@ android {
     targetCompatibility JavaVersion.VERSION_11
   }
   compileSdkVersion 34
+  buildToolsVersion '32.0.0'
 
   sourceSets {
     main {
diff --git a/auth/auth_resources/build.gradle b/auth/auth_resources/build.gradle
@@ -37,6 +37,7 @@ android {
     targetCompatibility JavaVersion.VERSION_11
   }
   compileSdkVersion 34
+  buildToolsVersion '32.0.0'
 
   sourceSets {
     main {
diff --git a/auth/integration_test/build.gradle b/auth/integration_test/build.gradle
@@ -55,7 +55,7 @@ android {
 
   defaultConfig {
     applicationId 'com.google.android.auth.testapp'
-    minSdkVersion 23
+    minSdkVersion 24
     targetSdkVersion 34
     versionCode 1
     versionName '1.0'
diff --git a/database/database_resources/build.gradle b/database/database_resources/build.gradle
@@ -33,6 +33,7 @@ apply plugin: 'com.android.library'
 
 android {
   compileSdkVersion 34
+  buildToolsVersion '32.0.0'
 
   sourceSets {
     main {
diff --git a/firestore/firestore_resources/build.gradle b/firestore/firestore_resources/build.gradle
@@ -37,6 +37,7 @@ android {
     targetCompatibility JavaVersion.VERSION_11
   }
   compileSdkVersion 34
+  buildToolsVersion '32.0.0'
 
   sourceSets {
     main {
diff --git a/gma/gma_resources/build.gradle b/gma/gma_resources/build.gradle
@@ -38,6 +38,7 @@ android {
   }
 
   compileSdkVersion 34
+  buildToolsVersion '32.0.0'
 
   sourceSets {
     main {
diff --git a/messaging/messaging_java/build.gradle b/messaging/messaging_java/build.gradle
@@ -42,6 +42,7 @@ android {
     targetCompatibility JavaVersion.VERSION_11
   }
   compileSdkVersion 34
+  buildToolsVersion '32.0.0'
 
   defaultConfig {
     minSdkVersion 23
diff --git a/remote_config/remote_config_resources/build.gradle b/remote_config/remote_config_resources/build.gradle
@@ -37,6 +37,7 @@ android {
     targetCompatibility JavaVersion.VERSION_11
   }
   compileSdkVersion 34
+  buildToolsVersion '32.0.0'
 
   sourceSets {
     main {
diff --git a/storage/storage_resources/build.gradle b/storage/storage_resources/build.gradle
@@ -37,6 +37,7 @@ android {
     targetCompatibility JavaVersion.VERSION_11
   }
   compileSdkVersion 34
+  buildToolsVersion '32.0.0'
 
   sourceSets {
     main {

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@ android {`
`37`	`37`	`targetCompatibility JavaVersion.VERSION_11`
`38`	`38`	`}`
`39`	`39`	`compileSdkVersion 34`
	`40`	`+ buildToolsVersion '32.0.0'`
`40`	`41`
`41`	`42`	`sourceSets {`
`42`	`43`	`main {`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ android {`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`compileSdkVersion 34`
	`41`	`+ buildToolsVersion '32.0.0'`
`41`	`42`
`42`	`43`	`sourceSets {`
`43`	`44`	`main {`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ android {`
`42`	`42`	`targetCompatibility JavaVersion.VERSION_11`
`43`	`43`	`}`
`44`	`44`	`compileSdkVersion 34`
	`45`	`+ buildToolsVersion '32.0.0'`
`45`	`46`
`46`	`47`	`defaultConfig {`
`47`	`48`	`minSdkVersion 23`