diff --git a/build.gradle b/build.gradle index 272e6d0..7ef9e92 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,3 @@ -apply plugin: "io.gitlab.arturbosch.detekt" - buildscript { repositories { google() @@ -14,6 +12,12 @@ buildscript { } } +plugins { + id("io.gitlab.arturbosch.detekt") version libs.versions.detekt + alias(libs.plugins.jetbrains.compose) apply false + alias(libs.plugins.compose.compiler) apply false +} + dependencies { detektPlugins libs.detekt.formatting } diff --git a/core/image-loader/android/build.gradle b/core/image-loader/android/build.gradle index 8364485..57c7871 100644 --- a/core/image-loader/android/build.gradle +++ b/core/image-loader/android/build.gradle @@ -1,5 +1,9 @@ -apply plugin: "com.android.library" -apply plugin: "kotlin-android" +plugins { + id("com.android.library") + id("kotlin-android") + alias(libs.plugins.jetbrains.compose) + alias(libs.plugins.compose.compiler) +} android { namespace 'com.krossovochkin.kweather.imageloader' diff --git a/core/image-loader/jvm/build.gradle b/core/image-loader/jvm/build.gradle index 607ae85..f5bf321 100644 --- a/core/image-loader/jvm/build.gradle +++ b/core/image-loader/jvm/build.gradle @@ -12,6 +12,12 @@ buildscript { } } +plugins { + id("kotlin-multiplatform") + alias(libs.plugins.jetbrains.compose) + alias(libs.plugins.compose.compiler) +} + repositories { mavenCentral() maven { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3d9ab98..ddbbf8b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,61 +2,68 @@ [versions] -android-compile-sdk = "34" +android-compile-sdk = "35" android-min-sdk = "24" -android-target-sdk = "34" +android-target-sdk = "35" app-version-code = "1" app-version-name = "1.0" -kotlin = "1.9.22" +kotlin = "2.0.21" -gradle-plugin-android = "8.4.0-alpha07" +gradle-plugin-android = "8.9.0-alpha03" -gradle-plugin-compose = "1.5.12" +gradle-plugin-compose = "1.7.1" -kotlinx-datetime = "0.5.0" +kotlinx-datetime = "0.6.1" -kodein-di = "7.21.2" +kodein-di = "7.22.0" -ktor = "2.3.8" +ktor = "2.3.13" +##⬆ = "3.0.1" -kotlinx-coroutines = "1.7.3" +kotlinx-coroutines = "1.9.0" -google-android-play-services-location = "21.1.0" +google-android-play-services-location = "21.3.0" -androidx-compose-navigation = "2.8.0-alpha01" +androidx-compose-navigation = "2.9.0-alpha03" -androidx-appcompat = "1.7.0-alpha03" +androidx-appcompat = "1.7.0" -androidx-activity = "1.9.0-alpha02" +androidx-activity = "1.10.0-beta01" -multiplatform-settings = "1.1.1" +multiplatform-settings = "1.2.0" androidx-preference = "1.2.1" -androidx-annotation = "1.7.1" +androidx-annotation = "1.9.1" -androidx-core = "1.13.0-alpha04" +androidx-core = "1.15.0" -androidx-compose-foundation = "1.6.0" +androidx-compose-foundation = "1.7.5" -androidx-compose-material = "1.5.4" +androidx-compose-material = "1.7.5" -androidx-compose-ui = "1.6.0" +androidx-compose-ui = "1.7.5" -google-android-material = "1.12.0-alpha03" +google-android-material = "1.13.0-alpha08" -google-accompanist = "0.35.0-alpha" +google-accompanist = "0.36.0" -androidx-compose-compiler = "1.5.8" +androidx-compose-compiler = "1.5.15" -coil-kt = "2.5.0" +coil-kt = "2.7.0" -detekt = "1.23.5" +detekt = "1.23.7" + +[plugins] + +jetbrains-compose = { id = "org.jetbrains.compose", version.ref = "gradle-plugin-compose" } + +compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } [libraries] @@ -70,6 +77,8 @@ gradle-plugin-detekt = { group = "io.gitlab.arturbosch.detekt", name = "detekt-g gradle-plugin-compose = { group = "org.jetbrains.compose", name = "compose-gradle-plugin", version.ref = "gradle-plugin-compose" } +jetbrains-compose-runtime = { group ="org.jetbrains.compose.runtime", name="runtime", version.ref = 'gradle-plugin-compose' } + detekt-formatting = { group = "io.gitlab.arturbosch.detekt", name = "detekt-formatting", version.ref = "detekt" } kodein-di = { group = "org.kodein.di", name = "kodein-di", version.ref = "kodein-di" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 112d221..7c4fb32 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-rc-1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip diff --git a/settings.gradle b/settings.gradle index ed7e32f..facc980 100644 --- a/settings.gradle +++ b/settings.gradle @@ -6,7 +6,7 @@ pluginManagement { } plugins { // See https://jmfayard.github.io/refreshVersions - id 'de.fayard.refreshVersions' version '0.60.4' + id 'de.fayard.refreshVersions' version '0.60.5' } rootProject.name = "KWeather" diff --git a/target/android/build.gradle b/target/android/build.gradle index 377e851..f5607c2 100644 --- a/target/android/build.gradle +++ b/target/android/build.gradle @@ -1,5 +1,9 @@ -apply plugin: "com.android.application" -apply plugin: "kotlin-android" +plugins { + id("com.android.application") + id("kotlin-android") + alias(libs.plugins.jetbrains.compose) + alias(libs.plugins.compose.compiler) +} apply from: "$rootDir/quality/lint.gradle" android { diff --git a/target/desktop/build.gradle b/target/desktop/build.gradle index 35bd7e7..c163d0e 100644 --- a/target/desktop/build.gradle +++ b/target/desktop/build.gradle @@ -14,6 +14,12 @@ buildscript { } } +plugins { + id("kotlin-multiplatform") + alias(libs.plugins.jetbrains.compose) + alias(libs.plugins.compose.compiler) +} + repositories { mavenCentral() maven { @@ -21,9 +27,6 @@ repositories { } } -apply plugin: "kotlin-multiplatform" -apply plugin: "org.jetbrains.compose" - kotlin { jvm { compilations.all { diff --git a/target/web/build.gradle b/target/web/build.gradle index 1917596..1ceb964 100644 --- a/target/web/build.gradle +++ b/target/web/build.gradle @@ -12,6 +12,12 @@ buildscript { } } +plugins { + id("kotlin-multiplatform") + alias(libs.plugins.jetbrains.compose) + alias(libs.plugins.compose.compiler) +} + repositories { mavenCentral() maven { @@ -19,9 +25,6 @@ repositories { } } -apply plugin: "kotlin-multiplatform" -apply plugin: "org.jetbrains.compose" - kotlin { js(IR) { browser() @@ -33,6 +36,7 @@ kotlin { implementation compose.web.core implementation compose.runtime implementation libs.kodein.di + implementation libs.kotlinx.coroutines.core implementation project(":shared") } } diff --git a/versions.properties b/versions.properties deleted file mode 100644 index d8758fd..0000000 --- a/versions.properties +++ /dev/null @@ -1,92 +0,0 @@ -#### Dependencies and Plugin versions with their available updates. -#### Generated by `./gradlew refreshVersions` version 0.60.3 -#### -#### Don't manually edit or split the comments that start with four hashtags (####), -#### they will be overwritten by refreshVersions. -#### -#### suppress inspection "SpellCheckingInspection" for whole file -#### suppress inspection "UnusedProperty" for whole file - -## unused -version.org.jetbrains.compose.web..web-core=1.3.0-alpha01-dev831 - -## unused -version.org.jetbrains.compose.runtime..runtime=1.3.0-alpha01-dev831 - -## unused -version.org.jetbrains.compose.desktop..desktop-jvm-windows-x64=1.3.0-alpha01-dev831 - -## unused -version.org.jetbrains.compose.compiler..compiler=1.3.0 - -## unused -version.org.jetbrains.compose..compose-gradle-plugin=1.3.0-alpha01-dev831 - -## unused -version.multiplatform-settings=1.0.0-RC - -## unused - version.ktor=2.1.2 - -## unused -version.kotlinx.datetime=0.4.0 - -## unused -version.kotlinx.coroutines=1.6.4 - -## unused -version.kotlin=1.7.10 - -## unused -version.kodein.di=7.15.0-kotlin-1.7.20-RC - -## unused -version.io.gitlab.arturbosch.detekt..detekt-gradle-plugin=1.22.0-RC2 - -## unused -version.io.gitlab.arturbosch.detekt..detekt-formatting=1.22.0-RC2 - -## unused -version.google.android.play-services-location=21.0.0 - -## unused -version.google.android.material=1.8.0-alpha02 - -## unused -version.google.accompanist=0.27.0 - -## unused -version.coil-kt=2.2.2 - -## unused -version.androidx.preference=1.2.0 - -## unused -version.androidx.navigation=2.6.0-alpha03 - -## unused -version.androidx.core=1.9.0 - -## unused -version.androidx.compose.ui=1.4.0-alpha01 - -## unused -version.androidx.compose.material=1.4.0-alpha01 - -## unused -version.androidx.compose.foundation=1.4.0-alpha01 - -## unused -version.androidx.compose.compiler=1.3.0 - -## unused -version.androidx.appcompat=1.7.0-alpha01 - -## unused -version.androidx.annotation=1.5.0 - -## unused -version.androidx.activity=1.7.0-alpha02 - -## unused -plugin.android=8.0.0-alpha06