Merge pull request #27 from Kotlin-Android-Open-Source/renovate/com.android.tools.build-gradle-7.x

hoc081098 · web-flow · commit be8d921ab26a · 2021-07-31T22:00:48.000+07:00
chore(deps): update dependency com.android.tools.build:gradle to v7
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,7 +16,7 @@ jobs:
       uses: actions/setup-java@v2
       with:
         distribution: 'zulu'
-        java-version: '8'
+        java-version: '11'
     
     - name: Make gradlew executable
       run: chmod +x ./gradlew
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -4,13 +4,13 @@ plugins {
 }
 
 android {
-  compileSdkVersion(appConfig.compileSdkVersion)
-  buildToolsVersion(appConfig.buildToolsVersion)
+  compileSdk = appConfig.compileSdkVersion
+  buildToolsVersion = appConfig.buildToolsVersion
 
   defaultConfig {
     applicationId = appConfig.applicationId
-    minSdkVersion(appConfig.minSdkVersion)
-    targetSdkVersion(appConfig.targetSdkVersion)
+    minSdk = appConfig.minSdkVersion
+    targetSdk = appConfig.targetSdkVersion
     versionCode = appConfig.versionCode
     versionName = appConfig.versionName
 
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -9,7 +9,7 @@ buildscript {
     gradlePluginPortal()
   }
   dependencies {
-    classpath("com.android.tools.build:gradle:4.2.2")
+    classpath("com.android.tools.build:gradle:7.0.0")
     classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
     classpath("com.diffplug.spotless:spotless-plugin-gradle:5.14.2")
     classpath("dev.ahmedmourad.nocopy:nocopy-gradle-plugin:1.4.0")
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -4,14 +4,12 @@ plugins {
 }
 
 android {
-  compileSdkVersion(appConfig.compileSdkVersion)
-  buildToolsVersion(appConfig.buildToolsVersion)
+  compileSdk = appConfig.compileSdkVersion
+  buildToolsVersion = appConfig.buildToolsVersion
 
   defaultConfig {
-    minSdkVersion(appConfig.minSdkVersion)
-    targetSdkVersion(appConfig.targetSdkVersion)
-    versionCode = appConfig.versionCode
-    versionName = appConfig.versionName
+    minSdk = appConfig.minSdkVersion
+    targetSdk = appConfig.targetSdkVersion
 
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }
diff --git a/data/build.gradle.kts b/data/build.gradle.kts
@@ -4,14 +4,12 @@ plugins {
 }
 
 android {
-  compileSdkVersion(appConfig.compileSdkVersion)
-  buildToolsVersion(appConfig.buildToolsVersion)
+  compileSdk = appConfig.compileSdkVersion
+  buildToolsVersion = appConfig.buildToolsVersion
 
   defaultConfig {
-    minSdkVersion(appConfig.minSdkVersion)
-    targetSdkVersion(appConfig.targetSdkVersion)
-    versionCode = appConfig.versionCode
-    versionName = appConfig.versionName
+    minSdk = appConfig.minSdkVersion
+    targetSdk = appConfig.targetSdkVersion
 
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }
diff --git a/feature-add/build.gradle.kts b/feature-add/build.gradle.kts
@@ -4,14 +4,12 @@ plugins {
 }
 
 android {
-  compileSdkVersion(appConfig.compileSdkVersion)
-  buildToolsVersion(appConfig.buildToolsVersion)
+  compileSdk = appConfig.compileSdkVersion
+  buildToolsVersion = appConfig.buildToolsVersion
 
   defaultConfig {
-    minSdkVersion(appConfig.minSdkVersion)
-    targetSdkVersion(appConfig.targetSdkVersion)
-    versionCode = appConfig.versionCode
-    versionName = appConfig.versionName
+    minSdk = appConfig.minSdkVersion
+    targetSdk = appConfig.targetSdkVersion
 
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }
diff --git a/feature-main/build.gradle.kts b/feature-main/build.gradle.kts
@@ -4,14 +4,12 @@ plugins {
 }
 
 android {
-  compileSdkVersion(appConfig.compileSdkVersion)
-  buildToolsVersion(appConfig.buildToolsVersion)
+  compileSdk = appConfig.compileSdkVersion
+  buildToolsVersion = appConfig.buildToolsVersion
 
   defaultConfig {
-    minSdkVersion(appConfig.minSdkVersion)
-    targetSdkVersion(appConfig.targetSdkVersion)
-    versionCode = appConfig.versionCode
-    versionName = appConfig.versionName
+    minSdk = appConfig.minSdkVersion
+    targetSdk = appConfig.targetSdkVersion
 
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }
diff --git a/feature-search/build.gradle.kts b/feature-search/build.gradle.kts
@@ -5,14 +5,12 @@ plugins {
 }
 
 android {
-  compileSdkVersion(appConfig.compileSdkVersion)
-  buildToolsVersion(appConfig.buildToolsVersion)
+  compileSdk = appConfig.compileSdkVersion
+  buildToolsVersion = appConfig.buildToolsVersion
 
   defaultConfig {
-    minSdkVersion(appConfig.minSdkVersion)
-    targetSdkVersion(appConfig.targetSdkVersion)
-    versionCode = appConfig.versionCode
-    versionName = appConfig.versionName
+    minSdk = appConfig.minSdkVersion
+    targetSdk = appConfig.targetSdkVersion
 
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ buildscript {`
`9`	`9`	`gradlePluginPortal()`
`10`	`10`	`}`
`11`	`11`	`dependencies {`
`12`		`- classpath("com.android.tools.build:gradle:4.2.2")`
	`12`	`+ classpath("com.android.tools.build:gradle:7.0.0")`
`13`	`13`	`classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")`
`14`	`14`	`classpath("com.diffplug.spotless:spotless-plugin-gradle:5.14.2")`
`15`	`15`	`classpath("dev.ahmedmourad.nocopy:nocopy-gradle-plugin:1.4.0")`