diff --git a/News-Android-App/build.gradle b/News-Android-App/build.gradle index c9be37b06..dd8a8464d 100644 --- a/News-Android-App/build.gradle +++ b/News-Android-App/build.gradle @@ -1,7 +1,5 @@ plugins { id 'com.android.application' - id 'kotlin-android' - id 'org.jetbrains.kotlin.kapt' id 'com.google.devtools.ksp' id 'io.gitlab.arturbosch.detekt' version "1.23.8" id "com.diffplug.spotless" version "8.2.1" @@ -25,8 +23,8 @@ android { vectorDrawables.useSupportLibrary = true - versionCode 195 - versionName "0.9.9.94" + versionCode 196 + versionName "0.9.9.95" } buildFeatures { @@ -45,22 +43,18 @@ android { targetCompatibility JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = "17" - } - buildTypes { debug { shrinkResources false minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' testProguardFiles 'proguard-test.pro' pseudoLocalesEnabled true } release { shrinkResources true minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' testProguardFiles 'proguard-test.pro' //signingConfig signingConfigs.debug } @@ -120,7 +114,7 @@ repositories { //needed for com.gu:option:1.3 in Android-DirectoryChooser } -final DAGGER_VERSION = '2.59.1' +final DAGGER_VERSION = '2.59.2' final GLIDE_VERSION = '5.0.5' final ESPRESSO_VERSION = '3.7.0' final OKHTTP_VERSION = '5.3.2' @@ -178,7 +172,7 @@ dependencies { } implementation "com.google.dagger:dagger:${DAGGER_VERSION}" - kapt "com.google.dagger:dagger-compiler:${DAGGER_VERSION}" + ksp "com.google.dagger:dagger-compiler:${DAGGER_VERSION}" implementation 'io.reactivex.rxjava3:rxandroid:3.0.2' // Because RxAndroid releases are few and far between, it is recommended you also @@ -201,9 +195,6 @@ dependencies { testImplementation 'com.google.dexmaker:dexmaker-mockito:1.2' testImplementation "com.squareup.okhttp3:mockwebserver:${OKHTTP_VERSION}" - - kaptAndroidTest "com.google.dagger:dagger-compiler:${DAGGER_VERSION}" - // https://mvnrepository.com/artifact/com.squareup.okhttp3/mockwebserver //androidTestImplementation "com.squareup.okhttp3:mockwebserver:${OKHTTP_VERSION}" diff --git a/build.gradle b/build.gradle index 7cf4a6ef3..02cabc2be 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ buildscript { ext { - kotlin_version = '2.2.0' + kotlin_version = '2.2.10' } repositories { google() @@ -10,12 +10,12 @@ buildscript { gradlePluginPortal() } dependencies { - classpath 'com.android.tools.build:gradle:8.13.2' + classpath 'com.android.tools.build:gradle:9.1.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } plugins { - id 'org.jetbrains.kotlin.kapt' version '2.2.0' apply false + id 'org.jetbrains.kotlin.kapt' version '2.2.10' apply false id 'com.google.devtools.ksp' version '2.3.5' apply false } diff --git a/fastlane/metadata/android/de-DE/changelogs/196.txt b/fastlane/metadata/android/de-DE/changelogs/196.txt new file mode 100644 index 000000000..2d51b9865 --- /dev/null +++ b/fastlane/metadata/android/de-DE/changelogs/196.txt @@ -0,0 +1,2 @@ +- Dependency updates +- Fixed - !1637 - Fix bug in "Mark all unread items as read" feature (thanks to @Unpublished) diff --git a/fastlane/metadata/android/en-US/changelogs/196.txt b/fastlane/metadata/android/en-US/changelogs/196.txt new file mode 100644 index 000000000..2d51b9865 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/196.txt @@ -0,0 +1,2 @@ +- Dependency updates +- Fixed - !1637 - Fix bug in "Mark all unread items as read" feature (thanks to @Unpublished) diff --git a/gradle.properties b/gradle.properties index d4339e584..9cd7a6374 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,3 +24,13 @@ android.useAndroidX=true android.enableJetifier=true org.gradle.dependency.verification.console=verbose org.gradle.jvmargs=-Xmx4096m +android.defaults.buildfeatures.resvalues=true +android.sdk.defaultTargetSdkToCompileSdkIfUnset=true +android.enableAppCompileTimeRClass=true +android.usesSdkInManifest.disallowed=true +android.uniquePackageNames=true +android.dependency.useConstraints=true +android.r8.strictFullModeForKeepRules=true +android.r8.optimizedResourceShrinking=true +android.builtInKotlin=true +android.newDsl=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37f853b1c..37f78a6af 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle b/settings.gradle index 14a1a4949..1b49512f7 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,8 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + } +} include ':News-Android-App' -// include ':MaterialShowcaseView:library' // include ':Android-SingleSignOn:lib'