diff --git a/app/build.gradle b/app/build.gradle index 4dd960f..debabb6 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,14 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 33 // 13.0 - buildToolsVersion "33.0.0" + compileSdk 34 // 13.0 project.archivesBaseName = "blokish-3.5" // sync with Manifest defaultConfig { applicationId "org.scoutant.blokish" minSdkVersion 28 // Android 9 - targetSdkVersion 32 // Android 12.1 + targetSdkVersion 34 // Android 14 versionCode 23 versionName "3.5" project.ext.set("archivesBaseName", "blokish-" + defaultConfig.versionName) @@ -22,9 +21,9 @@ android { dependencies { testImplementation 'junit:junit:4.13.2' - implementation 'com.google.android.material:material:1.7.0' + implementation 'com.google.android.material:material:1.12.0' implementation "androidx.coordinatorlayout:coordinatorlayout:1.2.0" - implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'androidx.appcompat:appcompat:1.7.0' implementation 'androidx.legacy:legacy-support-v4:1.0.0' // implementation 'androidx.preference:preference:1.1.0' // TODO migrate preferences diff --git a/build.gradle b/build.gradle index e2f52cc..3fa6c71 100755 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:7.3.1' + classpath 'com.android.tools.build:gradle:8.5.1' } } diff --git a/gradle.properties b/gradle.properties index 3cb99a0..29b2d12 100755 --- a/gradle.properties +++ b/gradle.properties @@ -15,5 +15,8 @@ #Fri May 27 16:34:25 CEST 2016 # android.useDeprecatedNdk=true +android.defaults.buildfeatures.buildconfig=true android.enableJetifier=true +android.nonFinalResIds=false +android.nonTransitiveRClass=false android.useAndroidX=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ac7fa3e..00086b0 100755 --- 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.5.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip