From 3a40031532937522e1f8d9d9ad44d3ba111fba8f Mon Sep 17 00:00:00 2001 From: fatih ergin Date: Fri, 25 Aug 2023 22:48:48 +0300 Subject: [PATCH] update compile sdk to 34 update kotlin version to 1.9.0 --- app/build.gradle | 20 +++++++++++++++----- build.gradle | 4 ++-- gradle.properties | 4 +++- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a088e04..15d5134 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,12 +8,13 @@ if (keystorePropertiesFile.exists()) { } android { - compileSdkVersion 33 + namespace "com.simplemobiletools.flashlight" + compileSdk 34 defaultConfig { applicationId "com.simplemobiletools.flashlight" - minSdkVersion 23 - targetSdkVersion 33 + minSdk 23 + targetSdk 34 versionCode 64 versionName "5.9.2" setProperty("archivesBaseName", "flashlight") @@ -48,7 +49,16 @@ android { } } - flavorDimensions "variants" + compileOptions { + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + } + + kotlinOptions { + jvmTarget = '17' + } + + flavorDimensions = ["variants"] productFlavors { core {} fdroid {} @@ -66,7 +76,7 @@ android { } dependencies { - implementation 'com.github.SimpleMobileTools:Simple-Commons:fa61be64d8' + implementation 'com.github.SimpleMobileTools:Simple-Commons:565200547d' implementation 'org.greenrobot:eventbus:3.3.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' } diff --git a/build.gradle b/build.gradle index 5dc760b..3675811 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.7.10' + ext.kotlin_version = '1.9.0' repositories { google() @@ -9,7 +9,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.3.1' + classpath 'com.android.tools.build:gradle:8.1.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle.properties b/gradle.properties index 5465fec..d1e2283 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,4 @@ android.enableJetifier=true -android.useAndroidX=true \ No newline at end of file +android.useAndroidX=true +android.nonTransitiveRClass=false +org.gradle.jvmargs=-Xmx4g diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c5b1459..13caf4a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip