diff --git a/Post/build.gradle b/Post/build.gradle index e2b7d5dc..6f651375 100644 --- a/Post/build.gradle +++ b/Post/build.gradle @@ -2,12 +2,12 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' android { - compileSdkVersion 29 + compileSdkVersion rootProject.ext.compileSDKVersion buildToolsVersion "29.0.3" defaultConfig { - minSdkVersion 21 - targetSdkVersion 29 + minSdkVersion rootProject.ext.minSDKVersion + targetSdkVersion rootProject.ext.targetSDKVersion versionCode 1 versionName "1.0" @@ -24,7 +24,5 @@ android { } dependencies { - implementation fileTree(dir: "libs", include: ["*.jar"]) - - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion" } \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index c37b8751..dc0c6049 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,15 +2,16 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' android { - compileSdkVersion 29 + compileSdkVersion rootProject.ext.compileSDKVersion buildToolsVersion "29.0.3" defaultConfig { applicationId "com.omgodse.notally" - minSdkVersion 21 - targetSdkVersion 29 - versionCode 23 - versionName "2.8" + minSdkVersion rootProject.ext.minSDKVersion + targetSdkVersion rootProject.ext.targetSDKVersion + versionCode 24 + versionName "2.9" + resConfigs 'en', 'de', 'es', 'fr', 'it', 'nb', 'ru', 'sv', 'tl', 'uk' testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -35,12 +36,10 @@ android { } dependencies { - implementation fileTree(include: ['*.jar'], dir: 'libs') - final def stableNavVersion = "2.3.0" final def stablePrefVersion = "1.1.1" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion" implementation 'androidx.core:core-ktx:1.3.1' implementation 'androidx.appcompat:appcompat:1.2.0' diff --git a/build.gradle b/build.gradle index 346def9f..027bd971 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,11 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.72' + ext.minSDKVersion = 21 + ext.targetSDKVersion = 29 + ext.compileSDKVersion = 29 + ext.kotlinVersion = '1.4.0' + repositories { google() jcenter() @@ -9,7 +13,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:4.0.1' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + 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 }