Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 6 additions & 15 deletions News-Android-App/build.gradle
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -25,8 +23,8 @@ android {

vectorDrawables.useSupportLibrary = true

versionCode 195
versionName "0.9.9.94"
versionCode 196
versionName "0.9.9.95"
}

buildFeatures {
Expand All @@ -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
}
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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
Expand All @@ -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}"

Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@

buildscript {
ext {
kotlin_version = '2.2.0'
kotlin_version = '2.2.10'
}
repositories {
google()
mavenCentral()
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
}
2 changes: 2 additions & 0 deletions fastlane/metadata/android/de-DE/changelogs/196.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Dependency updates
- Fixed - !1637 - Fix bug in "Mark all unread items as read" feature (thanks to @Unpublished)
2 changes: 2 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/196.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Dependency updates
- Fixed - !1637 - Fix bug in "Mark all unread items as read" feature (thanks to @Unpublished)
10 changes: 10 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
7 changes: 6 additions & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
pluginManagement {
repositories {
gradlePluginPortal()
google()
}
}
include ':News-Android-App'
// include ':MaterialShowcaseView:library'
// include ':Android-SingleSignOn:lib'
Loading