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.

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

Bump libraries #242

Merged
merged 15 commits into from
Dec 21, 2023
Merged

Bump libraries #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
072cbbe
Bump gradle version to 8.5
yasinkacmaz Dec 21, 2023
762dddb
Bump android gradle plugin version to 8.3.0-alpha18
yasinkacmaz Dec 21, 2023
9140516
Bump dependency updates plugin to 0.50.0
yasinkacmaz Dec 21, 2023
a22274c
Compile using Java 17
yasinkacmaz Dec 21, 2023
e545141
Bump compose version to 1.6.0-beta03
yasinkacmaz Dec 21, 2023
fbe453d
Bump androidX libraries
yasinkacmaz Dec 21, 2023
3a66363
Bump kotlin version to 1.9.21
yasinkacmaz Dec 21, 2023
8019b99
Bump compose compiler version to 1.5.7
yasinkacmaz Dec 21, 2023
04aca94
Bump dagger hilt version to 2.50
yasinkacmaz Dec 21, 2023
9a1257d
Bump ktor version to 3.0.0-beta-1
yasinkacmaz Dec 21, 2023
ca7f3c4
Bump kotlinx libraries
yasinkacmaz Dec 21, 2023
5fc9083
Bump coil version to 2.5.0
yasinkacmaz Dec 21, 2023
6208b36
Bump ksp version to 1.9.21-1.0.16
yasinkacmaz Dec 21, 2023
aa421c0
Bump okhttp version to 5.0.0-alpha.12
yasinkacmaz Dec 21, 2023
c854400
Add tracing dependency
yasinkacmaz Dec 21, 2023
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
1 change: 1 addition & 0 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ dependencies {
implementation(libs.coil)
implementation(libs.hilt)
ksp(libs.hiltCompiler)
debugImplementation(libs.androidX.tracing)
debugImplementation(libs.compose.testManifest)
testImplementation(libs.bundles.test)
androidTestImplementation(libs.bundles.androidTest)
Expand Down
4 changes: 2 additions & 2 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ plugins {
alias(libs.plugins.ksp) apply false
alias(libs.plugins.serialization) apply false
alias(libs.plugins.hilt) apply false
alias(libs.plugins.versions) apply true
alias(libs.plugins.dependencyVersions) apply true
}

subprojects {
Expand Down Expand Up @@ -75,7 +75,7 @@ tasks.withType<Test>().configureEach {
// Change gradleVersion and run gradlew wrapper to properly update gradle wrapper
tasks.named<Wrapper>("wrapper") {
distributionType = Wrapper.DistributionType.BIN
gradleVersion = "8.4-rc-1"
gradleVersion = "8.5"
}

task("clean", Delete::class) {
Expand Down
48 changes: 24 additions & 24 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,37 @@
[versions]
kotlin = "1.9.10"
daggerHilt = "2.48"
compose = "1.6.0-alpha06"
composeCompiler = "1.5.3"
ktor = "2.3.4"
java = "11"
kotlin = "1.9.21"
daggerHilt = "2.50"
compose = "1.6.0-beta03"
composeCompiler = "1.5.7"
ktor = "3.0.0-beta-1"
java = "17"
minSdk = "21"
targetSdk = "34"
compileSdk = "34"
versionName = "1.3.0"
versionCode = "4"

[plugins]
agp = { id = "com.android.application", version = "8.1.1" }
agp = { id = "com.android.application", version = "8.3.0-alpha18" }
hilt = { id = "com.google.dagger.hilt.android", version.ref = "daggerHilt" }
kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
ksp = { id = "com.google.devtools.ksp", version = "1.9.10-1.0.13" }
ksp = { id = "com.google.devtools.ksp", version = "1.9.21-1.0.16" }
serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
versions = { id = "com.github.ben-manes.versions", version = "0.48.0" }
dependencyVersions = { id = "com.github.ben-manes.versions", version = "0.50.0" }

[libraries]
ktorCore = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
ktorContentNegotiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktor" }
ktorOkhttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "ktor" }
ktorSerialization = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktor" }
okhttp = { module = "com.squareup.okhttp3:okhttp", version = "5.0.0-alpha.11" }
coil = { module = "io.coil-kt:coil-compose", version = "2.4.0" }
jsonSerialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version = "1.6.0" }
okhttp = { module = "com.squareup.okhttp3:okhttp", version = "5.0.0-alpha.12" }
coil = { module = "io.coil-kt:coil-compose", version = "2.5.0" }
jsonSerialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version = "1.6.2" }
androidX_palette = { module = "androidx.palette:palette", version = "1.0.0" }
androidX_browser = { module = "androidx.browser:browser", version = "1.6.0" }
androidX_datastore = { module = "androidx.datastore:datastore-preferences", version = "1.1.0-alpha05" }
androidX_corektx = { module = "androidx.core:core-ktx", version = "1.12.0" }
androidX_browser = { module = "androidx.browser:browser", version = "1.8.0-beta01" }
androidX_datastore = { module = "androidx.datastore:datastore-preferences", version = "1.1.0-alpha07" }
androidX_corektx = { module = "androidx.core:core-ktx", version = "1.13.0-alpha02" }
androidX_tracing = { module = "androidx.tracing:tracing", version = "1.2.0" }
compose_runtime = { module = "androidx.compose.runtime:runtime", version.ref = "compose" }
compose_foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose" }
compose_layout = { module = "androidx.compose.foundation:foundation-layout", version.ref = "compose" }
Expand All @@ -44,26 +45,25 @@ compose_uiTest = { module = "androidx.compose.ui:ui-test", version.ref = "compos
compose_uiTestJunit = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "compose" }
compose_testManifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "compose" }
compose_paging = { module = "androidx.paging:paging-compose", version = "3.3.0-alpha02" }
compose_activity = { module = "androidx.activity:activity-compose", version = "1.8.0-rc01" }
compose_viewModel = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version = "2.7.0-alpha02" }
compose_navigation = { module = "androidx.navigation:navigation-compose", version = "2.7.3" }
compose_hiltNavigation = { module = "androidx.hilt:hilt-navigation-compose", version = "1.1.0-alpha01" }
compose_constraintLayout = { module = "androidx.constraintlayout:constraintlayout-compose", version = "1.1.0-alpha12" }
compose_tracing = { module = "androidx.compose.runtime:runtime-tracing", version = "1.0.0-alpha03" }
compose_activity = { module = "androidx.activity:activity-compose", version = "1.9.0-alpha01" }
compose_viewModel = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version = "2.7.0-rc02" }
compose_navigation = { module = "androidx.navigation:navigation-compose", version = "2.7.6" }
compose_hiltNavigation = { module = "androidx.hilt:hilt-navigation-compose", version = "1.2.0-alpha01" }
compose_constraintLayout = { module = "androidx.constraintlayout:constraintlayout-compose", version = "1.1.0-alpha13" }
hilt = { module = "com.google.dagger:hilt-android", version.ref = "daggerHilt" }
hiltCompiler = { module = "com.google.dagger:hilt-android-compiler", version.ref = "daggerHilt" }
junit = { module = "junit:junit", version = "4.13.2" }
junitExt = { module = "androidx.test.ext:junit", version = "1.2.0-alpha01" }
junitExt = { module = "androidx.test.ext:junit", version = "1.2.0-alpha02" }
strikt = { module = "io.strikt:strikt-core", version = "0.34.1" }
coroutinesTest = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version = "1.7.3" }
coroutinesTest = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version = "1.8.0-RC" }

[bundles]
androidX = ["androidX_palette", "androidX_browser", "androidX_datastore", "androidX_corektx"]
compose = [
"compose_runtime", "compose_foundation", "compose_layout", "compose_ui", "compose_uiUtil",
"compose_material", "compose_materialIcons", "compose_animation", "compose_tooling",
"compose_paging", "compose_activity", "compose_viewModel", "compose_navigation",
"compose_hiltNavigation", "compose_constraintLayout", "compose_tracing"
"compose_hiltNavigation", "compose_constraintLayout"
]
io = ["okhttp", "jsonSerialization", "ktorCore", "ktorContentNegotiation", "ktorOkhttp", "ktorSerialization"]
test = ["junit", "strikt", "coroutinesTest"]
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 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,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-rc-1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
rootProject.name = "Jetflix"
rootProject.name = "jetflix"
include(":app")
pluginManagement {
repositories {
Expand Down