Skip to content
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.

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

UNT-T27290: Dependency version update and update Java version. #72

Merged
merged 1 commit into from
Jul 22, 2024
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
9 changes: 4 additions & 5 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@ android {
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_11.toString()
jvmTarget = JavaVersion.VERSION_17.toString()
}
}

Expand All @@ -65,7 +65,6 @@ dependencies {
// UI
implementation(libs.androidx.appcompat)
implementation(libs.androidx.constraintlayout)
implementation(libs.material)

// Jetpack
implementation(libs.androidx.activity.ktx)
Expand All @@ -90,7 +89,7 @@ dependencies {

// UI testing
androidTestImplementation(libs.androidx.runner)
androidTestImplementation(libs.androidx.junit.v111)
androidTestImplementation(libs.androidx.junit)
androidTestImplementation(libs.rules)
androidTestImplementation(libs.androidx.espresso.core)
androidTestImplementation(libs.androidx.espresso.contrib)
Expand Down
5 changes: 1 addition & 4 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,5 @@
plugins {
alias(libs.plugins.android.application) apply false
alias(libs.plugins.kotlin.android) apply false
alias(libs.plugins.android.libray) apply false
alias(libs.plugins.hilt.android) apply false
alias(libs.plugins.com.google.gms.google.services) apply false

alias(libs.plugins.android.library) apply false
}
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
repositories {
jcenter()
mavenCentral()
}

plugins {
Expand Down
40 changes: 18 additions & 22 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,31 @@ target-sdk = "34"
version-code = "1"
version-name = "1.8"

activity-ktx = "1.8.2"
androidx-junit = "1.1.5"
androidx-test-ext-junit = "1.1.5"
appcompat = "1.6.1"
activity-ktx = "1.9.0"
androidx-junit = "1.2.1"
appcompat = "1.7.0"
coil = "2.5.0"
constraintlayout = "2.1.4"
core-ktx = "1.12.0"
core-ktx = "1.13.1"
core-testing = "2.2.0"
espresso-contrib = "3.5.1"
espresso-core = "3.5.1"
fragment-ktx = "1.6.2"
espresso-contrib = "3.6.1"
espresso-core = "3.6.1"
fragment-ktx = "1.8.1"
glide = "4.16.0"
junit = "4.13.2"
lifecycle-livedata = "2.7.0"
lifecycle-livedata-ktx = "2.7.0"
material = "1.11.0"
lifecycle-livedata = "2.8.3"
lifecycle-livedata-ktx = "2.8.3"
material = "1.12.0"
recyclerview = "1.3.2"
rules = "1.5.0"
runner = "1.5.2"
rules = "1.6.1"
runner = "1.6.1"
sdp-android = "1.1.0"
ssp-android = "1.1.0"
ucrop = "2.2.8"
androidGradlePlugin = "8.2.1"
androidLibraryPlugin = "8.2.1"
googlePlayService = "4.4.0"
kotlinGradlePlugin = "1.9.21"
hilt = "2.50"
androidGradlePlugin = "8.5.1"
androidLibraryPlugin = "8.5.1"
kotlinGradlePlugin = "1.9.23"

[libraries]
androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "activity-ktx" }
androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
Expand All @@ -42,7 +40,6 @@ androidx-espresso-contrib = { module = "androidx.test.espresso:espresso-contrib"
androidx-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso-core" }
androidx-fragment-ktx = { module = "androidx.fragment:fragment-ktx", version.ref = "fragment-ktx" }
androidx-junit = { module = "androidx.test.ext:junit", version.ref = "androidx-junit" }
androidx-junit-v111 = { module = "androidx.test.ext:junit", version.ref = "androidx-test-ext-junit" }
androidx-lifecycle-livedata = { module = "androidx.lifecycle:lifecycle-livedata", version.ref = "lifecycle-livedata" }
androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version.ref = "recyclerview" }
androidx-runner = { module = "androidx.test:runner", version.ref = "runner" }
Expand All @@ -56,9 +53,8 @@ rules = { module = "androidx.test:rules", version.ref = "rules" }
sdp-android = { module = "com.intuit.sdp:sdp-android", version.ref = "sdp-android" }
ssp-android = { module = "com.intuit.ssp:ssp-android", version.ref = "ssp-android" }
ucrop = { module = "com.github.yalantis:ucrop", version.ref = "ucrop" }

[plugins]
android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
android-libray = { id = "com.android.library", version.ref = "androidLibraryPlugin" }
com-google-gms-google-services = { id = "com.google.gms.google-services", version.ref = "googlePlayService" }
hilt-android = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
android-library = { id = "com.android.library", version.ref = "androidLibraryPlugin" }
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlinGradlePlugin" }
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 @@
#Wed Jun 30 20:15:07 IST 2021
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
6 changes: 3 additions & 3 deletions imagepickerlibrary/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@ android {
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_11.toString()
jvmTarget = JavaVersion.VERSION_17.toString()
}
}

Expand Down