Skip to content

Commit

Permalink
Update libraries
Browse files Browse the repository at this point in the history
  • Loading branch information
mahozad committed Jul 4, 2024
1 parent d79d7f3 commit 72c23a2
Show file tree
Hide file tree
Showing 11 changed files with 27 additions and 16 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
/local.properties
/.idea
.DS_Store
.kotlin/
build/
/captures
.externalNativeBuild
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.compose.multiplatform) apply false
alias(libs.plugins.kotlin.multiplatform) apply false
alias(libs.plugins.kotlin.compatibility) apply false
alias(libs.plugins.kotlin.compose) apply false
alias(libs.plugins.android.application) apply false
alias(libs.plugins.android.library) apply false
alias(libs.plugins.dokka) apply false
Expand Down
29 changes: 15 additions & 14 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
[versions]
gradle = "8.6"
java = "17"
kotlin = "1.9.22"
gradle = "8.8"
java = "21"
kotlin = "2.0.0"
kotlin-compatibility = "0.14.0"
compose-multiplatform = "1.6.0-beta02"
agp = "8.2.2" # Android Gradle plugin
compose-multiplatform = "1.6.11"
agp = "8.3.2" # Android Gradle plugin
android-minSdk = "21"
android-compileSdk = "34"
android-targetSdk = "34"
androidx-activityCompose = "1.8.2"
androidx-core = "1.12.0"
androidx-appcompat = "1.6.1"
androidx-compose-ui = "1.6.1"
androidx-lifecycle = "2.7.0"
androidx-test-core = "1.5.0"
androidx-test-junit = "1.1.5"
skiko = "0.7.92"
dokka = "1.9.10"
androidx-activityCompose = "1.9.0"
androidx-core = "1.13.1"
androidx-appcompat = "1.7.0"
androidx-compose-ui = "1.6.8"
androidx-lifecycle = "2.8.3"
androidx-test-core = "1.6.1"
androidx-test-junit = "1.2.1"
skiko = "0.8.9"
dokka = "1.9.20"
junit4 = "4.13.2"

[libraries]
Expand All @@ -37,6 +37,7 @@ junit4 = { group = "junit", name = "junit", version.ref = "junit4" }
compose-multiplatform = { id = "org.jetbrains.compose", version.ref = "compose-multiplatform" }
kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
kotlin-compatibility = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "kotlin-compatibility" }
kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
android-application = { id = "com.android.application", version.ref = "agp" }
android-library = { id = "com.android.library", version.ref = "agp" }
dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
1 change: 1 addition & 0 deletions library/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import java.util.*
plugins {
alias(libs.plugins.kotlin.multiplatform)
alias(libs.plugins.kotlin.compatibility)
alias(libs.plugins.kotlin.compose)
alias(libs.plugins.compose.multiplatform)
alias(libs.plugins.android.library)
alias(libs.plugins.dokka)
Expand Down
1 change: 1 addition & 0 deletions showcase/androidApp/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
plugins {
alias(libs.plugins.kotlin.multiplatform)
alias(libs.plugins.kotlin.compose)
alias(libs.plugins.compose.multiplatform)
alias(libs.plugins.android.application)
}
Expand Down
1 change: 1 addition & 0 deletions showcase/desktopApp/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat

plugins {
alias(libs.plugins.kotlin.multiplatform)
alias(libs.plugins.kotlin.compose)
alias(libs.plugins.compose.multiplatform)
}

Expand Down
1 change: 1 addition & 0 deletions showcase/jsApp/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
plugins {
alias(libs.plugins.kotlin.multiplatform)
alias(libs.plugins.kotlin.compose)
alias(libs.plugins.compose.multiplatform)
}

Expand Down
1 change: 1 addition & 0 deletions showcase/shared/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl

plugins {
alias(libs.plugins.kotlin.multiplatform)
alias(libs.plugins.kotlin.compose)
alias(libs.plugins.compose.multiplatform)
alias(libs.plugins.android.library)
// kotlin("native.cocoapods")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import org.jetbrains.compose.resources.painterResource
import kotlin.time.Duration
import kotlin.time.Duration.Companion.milliseconds
import kotlin.time.measureTimedValue
import comshot.showcase.shared.generated.resources.Photo_by_Lucas_Chizzali_on_Unsplash

@OptIn(ExperimentalResourceApi::class)
@Composable
Expand All @@ -41,7 +42,7 @@ fun Activity.MainView() {
Text(text = "!".repeat(padding))
Column(horizontalAlignment = Alignment.CenterHorizontally) {
Image(
painter = painterResource(Res.drawable.photo_by_lucas_chizzali_on_unsplash),
painter = painterResource(Res.drawable.Photo_by_Lucas_Chizzali_on_Unsplash),
modifier = Modifier.size(200.dp),
contentDescription = null
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import org.jetbrains.compose.resources.painterResource
import kotlin.time.Duration
import kotlin.time.Duration.Companion.milliseconds
import kotlin.time.measureTimedValue
import comshot.showcase.shared.generated.resources.Photo_by_Lucas_Chizzali_on_Unsplash

@OptIn(ExperimentalResourceApi::class)
@Composable
Expand All @@ -40,7 +41,7 @@ fun App() {
Text(text = "!".repeat(padding))
Column(horizontalAlignment = Alignment.CenterHorizontally) {
Image(
painter = painterResource(Res.drawable.photo_by_lucas_chizzali_on_unsplash),
painter = painterResource(Res.drawable.Photo_by_Lucas_Chizzali_on_Unsplash),
modifier = Modifier.size(200.dp),
contentDescription = null
)
Expand Down
1 change: 1 addition & 0 deletions showcase/wasmJsApp/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl

plugins {
alias(libs.plugins.kotlin.multiplatform)
alias(libs.plugins.kotlin.compose)
alias(libs.plugins.compose.multiplatform)
}

Expand Down

0 comments on commit 72c23a2

Please sign in to comment.