Skip to content

Commit

Permalink
Update Dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
swapnil-musale committed Jun 5, 2024
1 parent eb976a6 commit a881a1f
Show file tree
Hide file tree
Showing 9 changed files with 36 additions and 35 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/android_cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ jobs:
- name: Checkout Repository
uses: actions/checkout@v4

- name: Set Up JDK 17
- name: Set Up JDK 18
uses: actions/setup-java@v4
with:
java-version: '17'
java-version: '1.8'
distribution: 'temurin'
cache: gradle

Expand Down Expand Up @@ -81,7 +81,7 @@ jobs:
app/build/outputs/bundle/release/
- name: Create Github Release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
with:
generate_release_notes: true
prerelease: false
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/android_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

- name: Set Up JDK 17
- name: Set Up JDK 18
uses: actions/setup-java@v4
with:
java-version: '17'
java-version: '1.8'
distribution: 'temurin'
cache: gradle

Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ captures/
.cxx/
*.apk
output.json
.kotlin

# IntelliJ
*.iml
Expand Down
8 changes: 3 additions & 5 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ plugins {
alias(libs.plugins.hilt)
alias(libs.plugins.kotlin.ksp)
alias(libs.plugins.detekt)
alias(libs.plugins.compose.compiler)
}
tasks.configureEach {
if (name == "compileDebugKotlin") {
Expand Down Expand Up @@ -43,8 +44,8 @@ android {
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = libs.versions.jvmTarget.get()
Expand All @@ -53,9 +54,6 @@ android {
compose = true
buildConfig = true
}
composeOptions {
kotlinCompilerExtensionVersion = libs.versions.androidxComposeCompiler.get()
}
packaging {
resources {
excludes += "/META-INF/{AL2.0,LGPL2.1}"
Expand Down
1 change: 1 addition & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ plugins {
alias(libs.plugins.kotlin.jvm) apply false
alias(libs.plugins.hilt) apply false
alias(libs.plugins.kotlin.ksp) apply false
alias(libs.plugins.compose.compiler) apply(false)
alias(libs.plugins.detekt)
}

Expand Down
4 changes: 2 additions & 2 deletions data/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ android {
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = libs.versions.jvmTarget.get()
Expand Down
4 changes: 2 additions & 2 deletions domain/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ dependencies {
}

java {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
3 changes: 2 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ kotlin.code.style=official
# thereby reducing the size of the R class for that library
android.nonTransitiveRClass=true
org.gradle.caching=true
org.gradle.configuration-cache=true
org.gradle.configuration-cache=true
kotlin.jvm.target.validation.mode = IGNORE
40 changes: 20 additions & 20 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,34 +1,33 @@
[versions]

# Plugin Version
androidGradlePlugin = "8.2.2"
androidLibrary = "8.2.2"
kotlinAndroid = "1.9.21"
kotlinJvm = "1.9.21"
androidxComposeCompiler = "1.5.7"
jvmTarget = "17"
kotlinKsp = "1.9.22-1.0.17"
androidGradlePlugin = "8.4.1"
androidLibrary = "8.4.1"
kotlin = "2.0.0"
jvmTarget = "1.8"
kotlinKsp = "2.0.0-1.0.21"
detektVersion = "1.23.5"

# Library Version
coreKtx = "1.12.0"
kotlinBOM = "1.9.23"
composeBOM = "2024.05.00"

coreKtx = "1.13.1"
splashScreen = "1.0.1"
activityCompose = "1.8.2"
activityCompose = "1.9.0"
composeNavigation = "2.7.7"
composeBOM = "2024.02.00"
kotlinBOM = "1.9.22"
androidXLifecycle = "2.7.0"
androidMaterial3 = "1.2.0"
hiltAndroid = "2.50"
androidXLifecycle = "2.8.1"
androidMaterial3 = "1.2.1"
hiltAndroid = "2.51.1"
retrofit = "2.9.0"
okHttp3 = "4.12.0"
moshi = "1.15.1"
javaxInject = "1"
hiltNavigation = "1.1.0"
konsist = "0.13.0"
hiltNavigation = "1.2.0"
konsist = "0.15.0"

# Testing Library Version
junit4 = "1.6.1"
junit4 = "1.6.7"
junit = "4.13.2"
junitExtension = "1.1.5"
espressoCore = "3.5.1"
Expand Down Expand Up @@ -87,9 +86,10 @@ retrofit = ["retrofit", "moshi-converter", "okhttp3", "loggin-interceptor"]
[plugins]
android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
android-library = { id = "com.android.library", version.ref = "androidLibrary" }
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlinAndroid" }
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlinJvm" }
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
java-library = { id = "java-library" }
hilt = { id = "com.google.dagger.hilt.android", version.ref = "hiltAndroid" }
kotlin-ksp = { id = "com.google.devtools.ksp", version.ref = "kotlinKsp" }
detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detektVersion" }
detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detektVersion" }
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

0 comments on commit a881a1f

Please sign in to comment.