From 0fb98bd96a85319f96e7d725d6c3ddcfd2ad969d Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 28 Jul 2021 17:03:41 +0000 Subject: [PATCH 1/4] chore(deps): update dependency com.android.tools.build:gradle to v7 --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 65f4f402..a56d167c 100644 --- 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") From 5e198788f2431d69174ccb058f24d2fcf578baf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petrus=20Nguy=E1=BB=85n=20Th=C3=A1i=20H=E1=BB=8Dc?= Date: Thu, 29 Jul 2021 20:27:30 +0700 Subject: [PATCH 2/4] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6040dd47..0bb98174 100644 --- 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 From b09809133756c1b2124524c95df82e3b07804e65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petrus=20Nguy=E1=BB=85n=20Th=C3=A1i=20H=E1=BB=8Dc?= Date: Fri, 30 Jul 2021 17:30:42 +0700 Subject: [PATCH 3/4] Update build.gradle.kts --- app/build.gradle.kts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 0ab64c98..822eb9d1 100644 --- 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 From 4db9bb695f2d5fca1f3727ed5f1a66604fb8eb3a Mon Sep 17 00:00:00 2001 From: Petrus Nguyen Thai Hoc Date: Sat, 31 Jul 2021 21:44:23 +0700 Subject: [PATCH 4/4] fix gradle --- .idea/compiler.xml | 2 +- .idea/gradle.xml | 2 +- .idea/misc.xml | 2 +- .idea/runConfigurations.xml | 10 ---------- core/build.gradle.kts | 10 ++++------ data/build.gradle.kts | 10 ++++------ feature-add/build.gradle.kts | 10 ++++------ feature-main/build.gradle.kts | 10 ++++------ feature-search/build.gradle.kts | 10 ++++------ 9 files changed, 23 insertions(+), 43 deletions(-) delete mode 100644 .idea/runConfigurations.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml index fb7f4a8a..7e7ee626 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 686bec5b..c22de178 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -4,7 +4,7 @@ - + diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 797acea5..00000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 0770677d..f775595d 100644 --- 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 index 58f18ee4..0c8c9167 100644 --- 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 index 0dadf41f..0a59bb08 100644 --- 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 index 420ab942..83ea61ed 100644 --- 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 index 11cf4165..979e47f9 100644 --- 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" }