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

Updated deps #134

Merged
merged 6 commits into from
Jun 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
6 changes: 2 additions & 4 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.kotlin)
alias(libs.plugins.composeCompiler)
alias(libs.plugins.hilt)
alias(libs.plugins.ksp)
alias(libs.plugins.detekt)
Expand Down Expand Up @@ -39,10 +40,7 @@ android {
buildFeatures {
compose = true
}

composeOptions {
kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
}
composeCompiler.enableStrongSkippingMode = true

packaging {
resources {
Expand Down
1 change: 1 addition & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ plugins {
alias(libs.plugins.android.application) apply false
alias(libs.plugins.android.library) apply false
alias(libs.plugins.kotlin) apply false
alias(libs.plugins.composeCompiler) apply false
alias(libs.plugins.hilt) apply false
alias(libs.plugins.ksp) apply false
}
Expand Down
6 changes: 2 additions & 4 deletions core/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin)
alias(libs.plugins.composeCompiler)
alias(libs.plugins.detekt)
}

Expand All @@ -15,10 +16,7 @@ android {
buildFeatures {
compose = true
}

composeOptions {
kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
}
composeCompiler.enableStrongSkippingMode = true

namespace = "com.imashnake.animite.core"
}
Expand Down
38 changes: 20 additions & 18 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[plugins]

android-application = { id = "com.android.application", version.ref = "agp" }
composeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
android-library = { id = "com.android.library", version.ref = "agp" }
kotlin = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
apolloKotlin = { id = "com.apollographql.apollo3", version.ref = "apollo" }
Expand All @@ -17,15 +18,15 @@ desugaring = "2.0.4"

# Android Gradle Plugin
# https://developer.android.com/studio/releases/gradle-plugin.
agp = "8.2.2"
agp = "8.5.0"

# AndroidX
# https://androidx.tech.
activity = "1.8.2"
core = "1.13.0-rc01"
lifecycle = "2.7.0"
extJunit = "1.2.0-alpha03"
espresso = "3.6.0-alpha03"
activity = "1.9.0"
core = "1.13.1"
lifecycle = "2.8.2"
extJunit = "1.2.0-rc01"
espresso = "3.6.0-rc01"

# TODO: Breaking changes; review release notes and update.
# Apollo Kotlin
Expand All @@ -34,25 +35,26 @@ apollo = "3.8.2"

# DataStore
# https://developer.android.com/jetpack/androidx/releases/datastore
datastore = "1.0.0"
datastore = "1.1.1"

# COIL
# https://github.com/coil-kt/coil/blob/main/CHANGELOG.md.
coil = "2.5.0"
coil = "2.6.0"

# TODO: Breaking changes; review release notes and update.
# Compose Destinations
# https://github.com/raamcosta/compose-destinations/releases.
composeDestinations = "1.9.59"
composeDestinations = "1.10.2"

# Compose
# https://developer.android.com/jetpack/androidx/releases/compose.
composeAnimation = "1.7.0-alpha06"
composeCompiler = "1.5.11"
composeFoundation = "1.7.0-alpha06"
composeMaterial = "1.7.0-alpha06"
composeMaterial3 = "1.3.0-alpha04"
composeRuntime = "1.7.0-alpha06"
composeUi = "1.7.0-alpha06"
composeAnimation = "1.7.0-beta03"
composeCompiler = "1.5.14"
composeFoundation = "1.7.0-beta03"
composeMaterial = "1.7.0-beta03"
composeMaterial3 = "1.3.0-beta03"
composeRuntime = "1.7.0-beta03"
composeUi = "1.7.0-beta03"

# Dagger
# https://github.com/google/dagger/releases.
Expand All @@ -64,12 +66,12 @@ hilt = "1.2.0"

# Kotlin
# https://kotlinlang.org/docs/releases.html#release-details.
kotlin = "1.9.23"
kotlin = "2.0.0"
coroutines = "1.8.0"

# KSP
# https://github.com/google/ksp/releases.
ksp = "1.9.23-1.0.19"
ksp = "2.0.0-1.0.22"

# Test
# https://github.com/junit-team/junit4/releases.
Expand Down
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.7-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
6 changes: 2 additions & 4 deletions profile/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin)
alias(libs.plugins.composeCompiler)
alias(libs.plugins.ksp)
alias(libs.plugins.detekt)
}
Expand All @@ -16,10 +17,7 @@ android {
buildFeatures {
compose = true
}

composeOptions {
kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
}
composeCompiler.enableStrongSkippingMode = true

namespace = "com.imashnake.animite.profile"
}
Expand Down
6 changes: 2 additions & 4 deletions rslash/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin)
alias(libs.plugins.composeCompiler)
alias(libs.plugins.ksp)
alias(libs.plugins.detekt)
}
Expand All @@ -16,10 +17,7 @@ android {
buildFeatures {
compose = true
}

composeOptions {
kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
}
composeCompiler.enableStrongSkippingMode = true

namespace = "com.imashnake.animite.rslash"
}
Expand Down
7 changes: 3 additions & 4 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@file:Suppress("UnstableApiUsage")

import com.android.build.api.dsl.SettingsExtension
import org.gradle.api.internal.FeaturePreviews
import org.gradle.api.internal.FeaturePreviews.Feature.TYPESAFE_PROJECT_ACCESSORS

pluginManagement {
repositories {
Expand Down Expand Up @@ -34,10 +33,10 @@ include(
":app"
)

configure<SettingsExtension> {
android {
buildToolsVersion = "34.0.0"
compileSdk = 34
minSdk = 29
}

enableFeaturePreview(FeaturePreviews.Feature.TYPESAFE_PROJECT_ACCESSORS.name)
enableFeaturePreview(TYPESAFE_PROJECT_ACCESSORS.name)
Loading