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

Changes by create-pull-request action #8

Merged
merged 33 commits into from
Nov 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
e854123
[create-pull-request] automated change
krossovochkin Nov 27, 2024
9394a14
Update libs.versions.toml
krossovochkin Nov 27, 2024
389a3be
Update gradle-wrapper.properties
krossovochkin Nov 27, 2024
7cef0dd
Update libs.versions.toml
krossovochkin Nov 27, 2024
836482b
Update build.gradle
krossovochkin Nov 27, 2024
e581095
Update module_default.gradle
krossovochkin Nov 27, 2024
500c6a2
Update libs.versions.toml
krossovochkin Nov 27, 2024
790a6d3
Update build.gradle
krossovochkin Nov 27, 2024
5f34913
Update build.gradle
krossovochkin Nov 27, 2024
ec679d4
Update build.gradle
krossovochkin Nov 28, 2024
3941dd0
Update build.gradle
krossovochkin Nov 28, 2024
107f6d7
Update build.gradle
krossovochkin Nov 28, 2024
45fe3cf
Update libs.versions.toml
krossovochkin Nov 28, 2024
6342f67
Update libs.versions.toml
krossovochkin Nov 28, 2024
0011e6e
Delete versions.properties
krossovochkin Nov 28, 2024
7a09ed7
Update module_default.gradle
krossovochkin Nov 28, 2024
1fb28d5
Update module_default.gradle
krossovochkin Nov 28, 2024
9a4d1c7
Update module_default.gradle
krossovochkin Nov 28, 2024
bcdb587
Update module_default.gradle
krossovochkin Nov 28, 2024
0776869
Update build.gradle
krossovochkin Nov 28, 2024
b4bdfea
Update build.gradle
krossovochkin Nov 28, 2024
38ae02e
Update build.gradle
krossovochkin Nov 28, 2024
2163ccd
Update build.gradle
krossovochkin Nov 28, 2024
010b181
Update build.gradle
krossovochkin Nov 28, 2024
0fd16d3
Update build.gradle
krossovochkin Nov 28, 2024
9647be0
Update build.gradle
krossovochkin Nov 29, 2024
c90b9a1
Update build.gradle
krossovochkin Nov 29, 2024
0b2005f
Update build.gradle
krossovochkin Nov 29, 2024
c18d423
Update module_default.gradle
krossovochkin Nov 29, 2024
4c99b1c
Update build.gradle
krossovochkin Nov 29, 2024
ced3647
Update build.gradle
krossovochkin Nov 29, 2024
da7d429
Update settings.gradle
krossovochkin Nov 29, 2024
b88c889
Update settings.gradle
krossovochkin Nov 29, 2024
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
8 changes: 6 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
apply plugin: "io.gitlab.arturbosch.detekt"

buildscript {
repositories {
google()
Expand All @@ -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
}
Expand Down
8 changes: 6 additions & 2 deletions core/image-loader/android/build.gradle
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
6 changes: 6 additions & 0 deletions core/image-loader/jvm/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@ buildscript {
}
}

plugins {
id("kotlin-multiplatform")
alias(libs.plugins.jetbrains.compose)
alias(libs.plugins.compose.compiler)
}

repositories {
mavenCentral()
maven {
Expand Down
57 changes: 33 additions & 24 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand All @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 6 additions & 2 deletions target/android/build.gradle
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
9 changes: 6 additions & 3 deletions target/desktop/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,19 @@ buildscript {
}
}

plugins {
id("kotlin-multiplatform")
alias(libs.plugins.jetbrains.compose)
alias(libs.plugins.compose.compiler)
}

repositories {
mavenCentral()
maven {
url "https://maven.pkg.jetbrains.space/public/p/compose/dev"
}
}

apply plugin: "kotlin-multiplatform"
apply plugin: "org.jetbrains.compose"

kotlin {
jvm {
compilations.all {
Expand Down
10 changes: 7 additions & 3 deletions target/web/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,19 @@ buildscript {
}
}

plugins {
id("kotlin-multiplatform")
alias(libs.plugins.jetbrains.compose)
alias(libs.plugins.compose.compiler)
}

repositories {
mavenCentral()
maven {
url "https://maven.pkg.jetbrains.space/public/p/compose/dev"
}
}

apply plugin: "kotlin-multiplatform"
apply plugin: "org.jetbrains.compose"

kotlin {
js(IR) {
browser()
Expand All @@ -33,6 +36,7 @@ kotlin {
implementation compose.web.core
implementation compose.runtime
implementation libs.kodein.di
implementation libs.kotlinx.coroutines.core
implementation project(":shared")
}
}
Expand Down
92 changes: 0 additions & 92 deletions versions.properties

This file was deleted.