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

Jump to bottom

Bump AGP to 8.1.0, Gradle to 8.2.1, Compose compiler to 1.5.1 #314

Merged
merged 3 commits into from
Jul 29, 2023
Merged

Bump AGP to 8.1.0, Gradle to 8.2.1, Compose compiler to 1.5.1 #314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
473e533
Bump AGP to 8.1.0 and Compose compiler to 1.5.1
skydoves Jul 29, 2023
26504d6
Bump coroutines, macro benchmark, ui automator
skydoves Jul 29, 2023
c528300
Bump Gradle to 8.2.1
skydoves Jul 29, 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
4 changes: 1 addition & 3 deletions build-logic/convention/src/main/kotlin/SpotlessConventionPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@ class SpotlessConventionPlugin : Plugin<Project> {
kotlin {
target("**/*.kt")
targetExclude("**/build/**/*.kt")
ktlint()
.setUseExperimental(true)
.editorConfigOverride(mapOf("indent_size" to 2, "continuation_indent_size" to 2))
ktlint().editorConfigOverride(mapOf("indent_size" to 2, "continuation_indent_size" to 2))
licenseHeaderFile(rootProject.file("$rootDir/spotless/copyright.kt"))
}
format("kts") {
Expand Down
2 changes: 1 addition & 1 deletion build-logic/convention/src/main/kotlin/com/skydoves/landscapist/AndroidCompose.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import org.gradle.kotlin.dsl.getByType
* Configure Compose-specific options
*/
internal fun Project.configureAndroidCompose(
commonExtension: CommonExtension<*, *, *, *>,
commonExtension: CommonExtension<*, *, *, *, *>,
) {
val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")

Expand Down
4 changes: 2 additions & 2 deletions build-logic/convention/src/main/kotlin/com/skydoves/landscapist/KotlinAndroid.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
* Configure base Kotlin with Android options
*/
internal fun Project.configureKotlinAndroid(
commonExtension: CommonExtension<*, *, *, *>,
commonExtension: CommonExtension<*, *, *, *, *>,
) {
val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")

Expand Down Expand Up @@ -62,6 +62,6 @@ internal fun Project.configureKotlinAndroid(
}
}

fun CommonExtension<*, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) {
fun CommonExtension<*, *, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) {
(this as ExtensionAware).extensions.configure("kotlinOptions", block)
}
16 changes: 8 additions & 8 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,27 @@ kotlin = "1.9.0"
dokka = "1.8.20"
jvmTarget = "17"
nexusPlugin = "1.3.0"
kotlinxCoroutines = "1.7.1"
kotlinBinaryCompatibility = "0.13.1"
androidGradlePlugin = "8.0.2"
kotlinxCoroutines = "1.7.2"
kotlinBinaryCompatibility = "0.13.2"
androidGradlePlugin = "8.1.0"
androidxActivity = "1.7.2"
androidxMaterial = "1.9.0"
androidxComposeBom = "2023.06.01"
androidxComposeCompiler = "1.5.0"
androidxComposeCompiler = "1.5.1"
androidxComposeConstraintLayout = "1.0.1"
androidxCore = "1.10.1"
androidxTestRunner = "1.5.2"
androidxTestRules = "1.5.0"
androidxJunit = "1.1.5"
androidxMacroBenchmark = "1.2.0-alpha13"
androidxMacroBenchmark = "1.2.0-beta02"
androidxProfileinstaller = "1.3.1"
androidxUiAutomator = "2.3.0-alpha02"
androidxUiAutomator = "2.3.0-alpha04"
glide = "4.15.1"
fresco = "2.6.0"
coil = "2.2.2"
coil = "2.3.0"
palette = "1.0.0"
hilt = "2.47"
spotless = "6.19.0"
spotless = "6.20.0"
desugar="2.0.3"

[libraries]
Expand Down
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.1.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading