Skip to content

Task/stad 657 upgrade dependencies fix transitive dependencies #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hb0 merged 4 commits into from
Mar 14, 2025
Merged

Task/stad 657 upgrade dependencies fix transitive dependencies #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7998f84
Upgrade gradle tools and wrapper
hb0 Mar 14, 2025
43c6b34
Make compat and datastore a transitive dependency
hb0 Mar 14, 2025
14ba1d0
Upgrade kotlin gradle plugin
hb0 Mar 14, 2025
175e65f
Upgrade dependencies and Java source compatibility to 21
hb0 Mar 14, 2025
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: 10 additions & 11 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
*/

buildscript {
ext.gradle_version = "8.2.2"
ext.kotlin_version = "1.9.22"
ext.gradle_version = "8.5.0"
ext.kotlin_version = "1.9.25"

repositories {
google()
Expand Down Expand Up @@ -55,25 +55,24 @@ ext {
compileSdkVersion = 34 // allows newest APIs to be used and to see deprecations, use latest

// Android dependencies
androidxAnnotationVersion = "1.6.0"
androidxAppCompatVersion = "1.7.0"
datastoreVersion = "1.1.1"
datastoreVersion = "1.1.3"

// Other
protobufVersion = '3.22.2' // For Proto Datastore. Maybe keep in sync with other versions.
protobufVersion = '4.30.0' // For Proto Datastore. Maybe keep in sync with other versions.

// Testing
junitVersion = "1.2.1"
mockitoVersion = '5.15.2'
hamcrestVersion = "1.3"
mockitoVersion = '5.16.0'
hamcrestVersion = "3.0"
rulesVersion = "1.6.1"
robolectricVersion = "4.10.2"
robolectricVersion = "4.14.1"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

// Java version
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
kotlinTargetJavaVersion = "17"
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
kotlinTargetJavaVersion = "21"
}

allprojects {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
33 changes: 20 additions & 13 deletions gradlew
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 12 additions & 10 deletions gradlew.bat
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 11 additions & 9 deletions utils/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,22 +71,24 @@ android {

dependencies {
// Android
implementation "androidx.appcompat:appcompat:$rootProject.ext.androidxAppCompatVersion"
// `api` as the API-class `PlaceholderNotificationBuilder` uses compat
api "androidx.appcompat:appcompat:$androidxAppCompatVersion"

// Proto DataStore with MultiProcess support to store settings
implementation "androidx.datastore:datastore:${datastoreVersion}"
implementation "com.google.protobuf:protobuf-javalite:${protobufVersion}"
// `api` as the API-class `AppSettings` uses datastore
api "androidx.datastore:datastore:$datastoreVersion"
implementation "com.google.protobuf:protobuf-javalite:$protobufVersion"

// Dependencies for instrumentation tests
androidTestImplementation "androidx.test.ext:junit:$rootProject.ext.junitVersion"
androidTestImplementation "androidx.test:rules:$rootProject.ext.rulesVersion"
androidTestImplementation "androidx.test.ext:junit:$junitVersion"
androidTestImplementation "androidx.test:rules:$rulesVersion"

// Dependencies for local unit tests
testImplementation "androidx.test.ext:junit:$rootProject.ext.junitVersion"
testImplementation "org.mockito:mockito-core:$rootProject.ext.mockitoVersion"
testImplementation "androidx.test.ext:junit:$junitVersion"
testImplementation "org.mockito:mockito-core:$mockitoVersion"
// Optional - For better debuggable asserts
testImplementation "org.hamcrest:hamcrest-all:$rootProject.ext.hamcrestVersion"
testImplementation "org.robolectric:robolectric:$rootProject.ext.robolectricVersion"
testImplementation "org.hamcrest:hamcrest:$hamcrestVersion"
testImplementation "org.robolectric:robolectric:$robolectricVersion"
}

// Required for Proto DataStore
Expand Down
Loading