diff --git a/Post/build.gradle b/Post/build.gradle index 9e26657d..abaa5258 100644 --- a/Post/build.gradle +++ b/Post/build.gradle @@ -4,12 +4,12 @@ plugins { } android { - compileSdkVersion rootProject.ext.compileSDKVersion - buildToolsVersion "30.0.3" + compileSdkVersion rootProject.ext.compileSdkVersion + buildToolsVersion rootProject.ext.buildToolsVersion defaultConfig { - minSdkVersion rootProject.ext.minSDKVersion - targetSdkVersion rootProject.ext.targetSDKVersion + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" } diff --git a/app/build.gradle b/app/build.gradle index cc645197..dc991612 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,16 +6,16 @@ plugins { } android { - compileSdkVersion rootProject.ext.compileSDKVersion - buildToolsVersion "30.0.3" + compileSdkVersion rootProject.ext.compileSdkVersion + buildToolsVersion rootProject.ext.buildToolsVersion defaultConfig { applicationId "com.omgodse.notally" - minSdkVersion rootProject.ext.minSDKVersion - targetSdkVersion rootProject.ext.targetSDKVersion - versionCode 31 - versionName "3.6" - resConfigs "en", "ca", "cs", "de", "es", "fr", "hu", "in", "it", "nb", "nl", "pl", "pt-rBR", "ru", "sv", "tl", "uk", "ja" + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion + versionCode 32 + versionName "3.7" + resConfigs "en", "ca", "cs", "de", "es", "fr", "hu", "in", "it", "ja", "nb", "nl", "pl", "pt-rBR", "ru", "sv", "tl", "uk" vectorDrawables.generatedDensities = [] } @@ -34,19 +34,14 @@ android { } } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - kotlinOptions { jvmTarget = JavaVersion.VERSION_1_8 } buildFeatures { viewBinding true } } dependencies { + final def navVersion = "2.3.5" final def roomVersion = "2.3.0" - final def stableNavVersion = "2.3.5" implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion" @@ -57,8 +52,8 @@ dependencies { implementation "androidx.room:room-ktx:$roomVersion" implementation "androidx.room:room-runtime:$roomVersion" - implementation "androidx.navigation:navigation-ui-ktx:$stableNavVersion" - implementation "androidx.navigation:navigation-fragment-ktx:$stableNavVersion" + implementation "androidx.navigation:navigation-ui-ktx:$navVersion" + implementation "androidx.navigation:navigation-fragment-ktx:$navVersion" implementation "org.ocpsoft.prettytime:prettytime:4.0.6.Final" implementation "com.google.android.material:material:1.3.0" diff --git a/build.gradle b/build.gradle index 9042a097..63109f0e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,19 +1,20 @@ buildscript { ext { - minSDKVersion = 21 - targetSDKVersion = 30 - compileSDKVersion = 30 - kotlinVersion = "1.4.32" + minSdkVersion = 21 + targetSdkVersion = 30 + compileSdkVersion = 30 + kotlinVersion = "1.5.0" + buildToolsVersion = "30.0.3" } repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:4.1.3" + classpath "com.android.tools.build:gradle:4.2.1" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5e123886..992a17fa 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Sat Feb 06 22:56:10 IST 2021 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists \ No newline at end of file