diff --git a/Example/android/build.gradle b/Example/android/build.gradle index 6ffa85342c..1fe673d629 100644 --- a/Example/android/build.gradle +++ b/Example/android/build.gradle @@ -1,13 +1,21 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { + ext { + buildToolsVersion = "30.0.2" + minSdkVersion = 21 + compileSdkVersion = 30 + targetSdkVersion = 30 + ndkVersion = "20.1.5948944" + kotlinVersion = "1.4.10" + } repositories { google() mavenCentral() } dependencies { classpath('com.android.tools.build:gradle:4.2.1') - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.20" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" } } @@ -27,11 +35,3 @@ allprojects { maven { url 'https://www.jitpack.io' } } } - -ext { - buildToolsVersion = "30.0.2" - minSdkVersion = 21 - compileSdkVersion = 30 - targetSdkVersion = 30 - ndkVersion = "20.1.5948944" -} diff --git a/TestsExample/android/build.gradle b/TestsExample/android/build.gradle index 31157cdc20..f90a0dc8db 100644 --- a/TestsExample/android/build.gradle +++ b/TestsExample/android/build.gradle @@ -7,6 +7,7 @@ buildscript { compileSdkVersion = 30 targetSdkVersion = 30 ndkVersion = "20.1.5948944" + kotlinVersion = "1.4.10" } repositories { google() @@ -14,7 +15,7 @@ buildscript { } dependencies { classpath('com.android.tools.build:gradle:4.2.1') - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.20" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/android/build.gradle b/android/build.gradle index 22687f6d81..1098245043 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,4 +1,7 @@ buildscript { + ext.safeExtGet = {prop, fallback -> + rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback + } repositories { google() jcenter() @@ -6,7 +9,7 @@ buildscript { } dependencies { classpath('com.android.tools.build:gradle:4.2.2') - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.20" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${safeExtGet('kotlinVersion', '1.4.10')}" classpath "com.diffplug.spotless:spotless-plugin-gradle:5.15.0" } } @@ -19,10 +22,6 @@ if (project == rootProject) { apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -def safeExtGet(prop, fallback) { - rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback -} - android { compileSdkVersion safeExtGet('compileSdkVersion', 28) @@ -57,6 +56,4 @@ dependencies { implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.0.0' implementation 'com.google.android.material:material:1.1.0' - implementation "androidx.core:core-ktx:1.6.0" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.20" }