refactor(android): update gradle to 7.3.0

iPel · Sep 26, 2022 · 3089713 · 3089713
1 parent 905a82d
commit 3089713
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 143 deletions.
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:$AGP_VERSION"
+        classpath "com.android.tools.build:gradle:7.3.0"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -26,15 +26,3 @@ allprojects {
         resolutionStrategy.cacheDynamicVersionsFor 1, 'seconds'
     }
 }
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}
-
-project.afterEvaluate {
-    delete 'framework/examples/android-demo/src/main/assets'
-    copy{
-        from "framework/examples/android-demo/res"
-        into "framework/examples/android-demo/src/main/assets"
-    }
-}
diff --git a/framework/android/build.gradle b/framework/android/build.gradle
@@ -23,25 +23,6 @@
 apply plugin: 'com.android.library'
 apply from: './publish.gradle'
 
-buildscript {
-  repositories {
-    google()
-    mavenCentral()
-  }
-  dependencies {
-    classpath "com.android.tools.build:gradle:$AGP_VERSION"
-    // NOTE: Do not place your application dependencies here; they belong
-    // in the individual module build.gradle files
-  }
-}
-
-allprojects {
-  repositories {
-    google()
-    mavenCentral()
-  }
-}
-
 android {
   archivesBaseName = ARCHIVES_BASE_NAME
   compileSdkVersion COMPILE_VERSION as int

diff --git a/framework/examples/android-demo/build.gradle b/framework/examples/android-demo/build.gradle
@@ -62,39 +62,6 @@ android {
     }
 }
 
-buildscript {
-    repositories {
-        google()
-        mavenCentral()
-    }
-    dependencies {
-        classpath "com.android.tools.build:gradle:$AGP_VERSION"
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
-}
-
-allprojects {
-    ext {
-        MAVEN_USER = System.getenv('maven_username')
-        MAVEN_PWD = System.getenv('maven_password')
-        MAVEN_URL = System.getenv('maven_url')
-    }
-    repositories {
-        if (MAVEN_URL != null) {
-            maven {
-                url MAVEN_URL
-                credentials {
-                    username MAVEN_USER
-                    password MAVEN_PWD
-                }
-            }
-        }
-        google()
-        mavenCentral()
-    }
-}
-
 dependencies {
     if (verifyReleaseAar) {
         // options for maven packages or local libs integration
@@ -115,3 +82,11 @@ dependencies {
     api 'com.github.bumptech.glide:glide:3.6.1'
     api 'androidx.legacy:legacy-support-v4:1.0.0'
 }
+
+project.afterEvaluate {
+    delete 'src/main/assets'
+    copy{
+        from "res"
+        into "src/main/assets"
+    }
+}
diff --git a/gradle.properties b/gradle.properties
@@ -6,7 +6,6 @@ android.disableAutomaticComponentCreation=true
 org.gradle.warning.mode=all
 org.gradle.jvmargs = -Xms1024m -Xmx4096m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 
-AGP_VERSION=7.2.2
 COMPILE_VERSION=30
 MIN_VERSION=21
 TARGET_VERSION=30

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/modules/android/hippy_support/build.gradle b/modules/android/hippy_support/build.gradle
@@ -1,24 +1,5 @@
 apply plugin: 'com.android.library'
 
-buildscript {
-    repositories {
-        google()
-        mavenCentral()
-    }
-    dependencies {
-        classpath "com.android.tools.build:gradle:$AGP_VERSION"
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
-}
-
-allprojects {
-    repositories {
-        google()
-        mavenCentral()
-    }
-}
-
 android {
     compileSdkVersion COMPILE_VERSION as int
 

diff --git a/modules/android/link_supplier/build.gradle b/modules/android/link_supplier/build.gradle
@@ -1,24 +1,5 @@
 apply plugin: 'com.android.library'
 
-buildscript {
-    repositories {
-        google()
-        mavenCentral()
-    }
-    dependencies {
-        classpath "com.android.tools.build:gradle:$AGP_VERSION"
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
-}
-
-allprojects {
-    repositories {
-        google()
-        mavenCentral()
-    }
-}
-
 android {
     compileSdkVersion COMPILE_VERSION as int
 

diff --git a/modules/android/serialization/build.gradle b/modules/android/serialization/build.gradle
@@ -1,24 +1,5 @@
 apply plugin: 'com.android.library'
 
-buildscript {
-    repositories {
-        google()
-        mavenCentral()
-    }
-    dependencies {
-        classpath "com.android.tools.build:gradle:$AGP_VERSION"
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
-}
-
-allprojects {
-    repositories {
-        google()
-        mavenCentral()
-    }
-}
-
 android {
     compileSdkVersion COMPILE_VERSION as int
 

diff --git a/renderer/native/android/build.gradle b/renderer/native/android/build.gradle
@@ -1,24 +1,5 @@
 apply plugin: 'com.android.library'
 
-buildscript {
-    repositories {
-        google()
-        mavenCentral()
-    }
-    dependencies {
-        classpath "com.android.tools.build:gradle:$AGP_VERSION"
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
-}
-
-allprojects {
-    repositories {
-        google()
-        mavenCentral()
-    }
-}
-
 android {
     compileSdkVersion COMPILE_VERSION as int