From f445f374a3642254d41ef224b4672081e66fb985 Mon Sep 17 00:00:00 2001 From: Lucas Nogueira Date: Thu, 18 Aug 2022 11:31:07 -0300 Subject: [PATCH] feat(android): update project dependencies --- .../templates/mobile/android/app/build.gradle.kts | 12 +++++------- .../cli/templates/mobile/android/build.gradle.kts | 2 +- .../mobile/android/buildSrc/build.gradle.kts | 2 +- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/tooling/cli/templates/mobile/android/app/build.gradle.kts b/tooling/cli/templates/mobile/android/app/build.gradle.kts index 13906b47c..cc33f0d8b 100644 --- a/tooling/cli/templates/mobile/android/app/build.gradle.kts +++ b/tooling/cli/templates/mobile/android/app/build.gradle.kts @@ -7,11 +7,11 @@ plugins { } android { - compileSdk = 31 + compileSdk = 33 defaultConfig { applicationId = "{{reverse-domain app.domain}}.{{snake-case app.name}}" minSdk = {{android.min-sdk-version}} - targetSdk = 31 + targetSdk = 33 versionCode = 1 versionName = "1.0" } @@ -66,9 +66,8 @@ dependencies { {{~#each android-app-dependencies}} implementation("{{this}}"){{/each}} implementation("androidx.webkit:webkit:1.4.0") - implementation("androidx.appcompat:appcompat:1.4.1") - implementation("com.google.android.material:material:1.6.0") - implementation("androidx.constraintlayout:constraintlayout:2.1.3") + implementation("androidx.appcompat:appcompat:1.5.0") + implementation("com.google.android.material:material:1.6.1") testImplementation("junit:junit:4.13.2") androidTestImplementation("androidx.test.ext:junit:1.1.3") androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0") @@ -76,8 +75,7 @@ dependencies { afterEvaluate { android.applicationVariants.all { - val buildType = "${buildType.name.capitalize()}" - productFlavors.forEach { + productFlavors.forEach { _ -> val archAndBuildType = name.capitalize() tasks["merge${archAndBuildType}JniLibFolders"].dependsOn(tasks["rustBuild${archAndBuildType}"]) } diff --git a/tooling/cli/templates/mobile/android/build.gradle.kts b/tooling/cli/templates/mobile/android/build.gradle.kts index f45e9c35a..8751beac1 100644 --- a/tooling/cli/templates/mobile/android/build.gradle.kts +++ b/tooling/cli/templates/mobile/android/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath("com.android.tools.build:gradle:7.0.2") + classpath("com.android.tools.build:gradle:7.2.2") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10") {{~#each android-project-dependencies}} classpath("{{this}}"){{/each}} diff --git a/tooling/cli/templates/mobile/android/buildSrc/build.gradle.kts b/tooling/cli/templates/mobile/android/buildSrc/build.gradle.kts index b0d0d4e65..f3753b206 100644 --- a/tooling/cli/templates/mobile/android/buildSrc/build.gradle.kts +++ b/tooling/cli/templates/mobile/android/buildSrc/build.gradle.kts @@ -22,6 +22,6 @@ repositories { dependencies { compileOnly(gradleApi()) - implementation("com.android.tools.build:gradle:7.0.2") + implementation("com.android.tools.build:gradle:7.2.2") } diff --git a/tooling/cli/templates/mobile/android/gradle/wrapper/gradle-wrapper.properties b/tooling/cli/templates/mobile/android/gradle/wrapper/gradle-wrapper.properties index 543ef62a1..5303f9c74 100644 --- a/tooling/cli/templates/mobile/android/gradle/wrapper/gradle-wrapper.properties +++ b/tooling/cli/templates/mobile/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Tue May 10 19:22:52 CST 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME