Skip to content

Commit

Permalink
Update plugin kotlin-multiplatform to v2 (#76)
Browse files Browse the repository at this point in the history
  • Loading branch information
juul-mobile-bot authored Jun 3, 2024
1 parent f39c3cf commit 9c82d87
Show file tree
Hide file tree
Showing 5 changed files with 576 additions and 315 deletions.
5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
*.xcodeproj/
.DS_Store
.gradle/
.idea/
.kotlin/
Info.plist
build/
local.properties
*.xcodeproj/
Info.plist
2 changes: 1 addition & 1 deletion android/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ plugins {
alias(libs.plugins.android.application)
kotlin("multiplatform")
alias(libs.plugins.kotlinter)
alias(libs.plugins.compose)
}

kotlin {
Expand Down Expand Up @@ -34,5 +35,4 @@ android {
disable += listOf("AndroidGradlePluginVersion", "GradleDependency", "MissingApplicationIcon")
}
buildFeatures.compose = true
composeOptions.kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
}
7 changes: 4 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@ buildscript {
}

plugins {
alias(libs.plugins.kotlin.multiplatform) apply false
alias(libs.plugins.android.library) apply false
alias(libs.plugins.android.application) apply false
alias(libs.plugins.swiftpackage) apply false
alias(libs.plugins.android.library) apply false
alias(libs.plugins.compose) apply false
alias(libs.plugins.kotlin.multiplatform) apply false
alias(libs.plugins.kotlinter) apply false
alias(libs.plugins.swiftpackage) apply false
}

allprojects {
Expand Down
8 changes: 4 additions & 4 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
[versions]
agp = "8.4.1"
android-compile = "34"
android-target = "33"
android-min = "21"
android-target = "33"
compose = "1.6.7"
compose-compiler = "1.5.14"
datadog-kmp = "0.2.0"
jvm-toolchain = "11"
kotlin = "2.0.0"

[libraries]
compose-activity = { module = "androidx.activity:activity-compose", version = "1.9.0" }
compose-compiler = { module = "androidx.compose.compiler:compiler", version.ref = "compose-compiler" }
compose-material = { module = "androidx.compose.material:material", version = "1.6.7" }
compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose" }
datadog-kmp = { module = "com.juul.datadog:datadog", version.ref = "datadog-kmp" }
Expand All @@ -27,6 +26,7 @@ compose = [
[plugins]
android-application = { id = "com.android.application", version.ref = "agp" }
android-library = { id = "com.android.library", version.ref = "agp" }
kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version = "1.9.24" }
compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
kotlinter = { id = "org.jmailen.kotlinter", version = "4.3.0" }
swiftpackage = { id = "io.github.luca992.multiplatform-swiftpackage", version = "2.2.2" }
Loading

0 comments on commit 9c82d87

Please sign in to comment.