--- a/build.gradle.kts Wed Oct 06 13:31:48 2021 -0400
+++ b/build.gradle.kts Wed Oct 06 15:22:05 2021 -0400
@@ -31,12 +31,12 @@
// some extra properties
-extra["compileSdkVersion"] = "android-29"
+extra["compileSdkInt"] = 31
allprojects {
repositories {
google().setupGoogleContent()
- jcenter()
+ mavenCentral()
}
apply<SourceLicenseCheckerPlugin>()
}
--- a/buildSrc/build.gradle.kts Wed Oct 06 13:31:48 2021 -0400
+++ b/buildSrc/build.gradle.kts Wed Oct 06 15:22:05 2021 -0400
@@ -28,13 +28,9 @@
version = "1.0"
-kotlinDslPluginOptions {
- experimentalWarning.set(false)
-}
-
repositories {
gradlePluginPortal()
- jcenter()
+ mavenCentral()
google()
maven {
// Workaround for genymotion plugin not working on gradle 5.0
@@ -47,7 +43,7 @@
}
dependencies {
- implementation("com.android.tools.build:gradle:4.0.1")
+ implementation("com.android.tools.build:gradle:7.0.2")
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.71")
implementation("com.genymotion:plugin:1.4.2")
implementation("gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.15.0")
--- a/geekdroid-firebase/build.gradle.kts Wed Oct 06 13:31:48 2021 -0400
+++ b/geekdroid-firebase/build.gradle.kts Wed Oct 06 15:22:05 2021 -0400
@@ -12,12 +12,12 @@
val artifactId by extra (archivesBaseName)
android {
- val compileSdkVersion: String by rootProject.extra
- compileSdkVersion(compileSdkVersion)
+ val compileSdkInt: Int by rootProject.extra
+ compileSdk = compileSdkInt
defaultConfig {
- minSdkVersion(24)
- targetSdkVersion(29)
+ minSdk = 24
+ targetSdk = 29
}
configureJavaVersion()
@@ -29,7 +29,7 @@
}
}
- lintOptions {
+ lint {
isAbortOnError = false
}
--- a/geekdroid/build.gradle.kts Wed Oct 06 13:31:48 2021 -0400
+++ b/geekdroid/build.gradle.kts Wed Oct 06 15:22:05 2021 -0400
@@ -35,12 +35,12 @@
val artifactId by extra (archivesBaseName)
android {
- val compileSdkVersion: String by rootProject.extra
- compileSdkVersion(compileSdkVersion)
+ val compileSdkInt: Int by rootProject.extra
+ compileSdk = compileSdkInt
defaultConfig {
- minSdkVersion(24)
- targetSdkVersion(29)
+ minSdk = 24
+ targetSdk = 29
}
configureJavaVersion()
@@ -52,7 +52,7 @@
}
}
- lintOptions {
+ lint {
isAbortOnError = false
}
--- a/gradle/wrapper/gradle-wrapper.properties Wed Oct 06 13:31:48 2021 -0400
+++ b/gradle/wrapper/gradle-wrapper.properties Wed Oct 06 15:22:05 2021 -0400
@@ -2,4 +2,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
--- a/settings.gradle.kts Wed Oct 06 13:31:48 2021 -0400
+++ b/settings.gradle.kts Wed Oct 06 15:22:05 2021 -0400
@@ -22,7 +22,7 @@
pluginManagement {
repositories {
gradlePluginPortal()
- jcenter()
+ mavenCentral()
google()
}
}