Skip to content
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
13 changes: 8 additions & 5 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@Suppress("DSL_SCOPE_VIOLATION")
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
id(libs.plugins.android.application.get().pluginId)
id(libs.plugins.kotlin.android.get().pluginId)
Expand All @@ -23,12 +24,14 @@ android {
}

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

kotlinOptions {
jvmTarget = libs.versions.jvmTarget.get()
kotlin {
compilerOptions {
jvmTarget.set(JvmTarget.fromTarget(libs.versions.jvmTarget.get()))
}
}

packaging {
Expand Down
22 changes: 14 additions & 8 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
@Suppress("DSL_SCOPE_VIOLATION")
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile

plugins {
alias(libs.plugins.android.application) apply false
alias(libs.plugins.android.library) apply false
Expand All @@ -13,12 +15,16 @@ plugins {

subprojects {
if (name != "app") {
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
kotlinOptions.jvmTarget = libs.versions.jvmTarget.get()
kotlinOptions.freeCompilerArgs += listOf(
"-Xexplicit-api=strict",
"-Xopt-in=kotlin.contracts.ExperimentalContracts"
)
tasks.withType<KotlinJvmCompile>().configureEach {
compilerOptions {
jvmTarget.set(JvmTarget.fromTarget(libs.versions.jvmTarget.get()))
freeCompilerArgs.addAll(
listOf(
"-Xexplicit-api=strict",
"-Xopt-in=kotlin.contracts.ExperimentalContracts"
)
)
}
}
}

Expand All @@ -27,7 +33,7 @@ subprojects {
kotlin {
target("**/*.kt")
targetExclude("$buildDir/**/*.kt")
ktlint().setUseExperimental(true).editorConfigOverride(
ktlint().editorConfigOverride(
mapOf(
"indent_size" to "2",
"continuation_indent_size" to "2"
Expand Down
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/Configuration.kt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
object Configuration {
const val compileSdk = 34
const val targetSdk = 34
const val compileSdk = 36
const val targetSdk = 36
const val minSdk = 21
const val majorVersion = 1
const val minorVersion = 2
Expand Down
22 changes: 11 additions & 11 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
[versions]
agp = "8.6.1"
kotlin = "2.0.21"
dokka = "1.9.0"
nexusPlugin = "0.30.0"
kotlinBinaryCompatibility = "0.16.3"
jvmTarget = "11"
agp = "8.12.0"
kotlin = "2.2.10"
dokka = "2.0.0"
nexusPlugin = "0.34.0"
kotlinBinaryCompatibility = "0.18.1"
jvmTarget = "17"
material = "1.12.0"
androidxActivity = "1.9.2"
androidxAppCompat = "1.7.0"
androidxCompose = "1.7.3"
landscapist = "2.4.1"
androidxActivity = "1.10.1"
androidxAppCompat = "1.7.1"
androidxCompose = "1.9.0"
landscapist = "2.5.1"
coroutines = "1.7.3"
retrofit = "2.9.0"
retrofitAdapters = "1.0.9"
robolectric = "4.12.1"
robolectric = "4.15.1"
spotless = "6.19.0"

[plugins]
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#Tue Oct 15 22:13:09 KST 2024
#Fri Aug 15 16:53:03 KST 2025
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
14 changes: 9 additions & 5 deletions whatif-android/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
@Suppress("DSL_SCOPE_VIOLATION")
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile

plugins {
id(libs.plugins.android.library.get().pluginId)
id(libs.plugins.kotlin.android.get().pluginId)
Expand Down Expand Up @@ -30,12 +32,14 @@ android {
}

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

kotlinOptions {
jvmTarget = libs.versions.jvmTarget.get()
kotlin {
compilerOptions {
jvmTarget.set(JvmTarget.fromTarget(libs.versions.jvmTarget.get()))
}
}
}

Expand Down
11 changes: 6 additions & 5 deletions whatif/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
id(libs.plugins.android.library.get().pluginId)
id(libs.plugins.nexus.plugin.get().pluginId)
Expand Down Expand Up @@ -39,9 +41,8 @@ kotlin {
}

jvm {
libs.versions.jvmTarget.get().toInt()
compilations.all {
kotlinOptions.jvmTarget = libs.versions.jvmTarget.get()
compilerOptions {
jvmTarget.set(JvmTarget.fromTarget(libs.versions.jvmTarget.get()))
}
}

Expand All @@ -66,8 +67,8 @@ android {
}

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

Expand Down
Loading