Skip to content

Commit

Permalink
kotlin 2.0 (wip)
Browse files Browse the repository at this point in the history
js sample not working. resources seem to be not pack correctly.
tests are probably still broken
  • Loading branch information
luca992 committed Jun 12, 2024
1 parent d5b06df commit 5c716ef
Show file tree
Hide file tree
Showing 572 changed files with 6,243 additions and 3,113 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,8 @@ lint/tmp/
*.hprof

.DS_Store
.kotlin

# moko-resources-generated
moko-resources-generated.js
pack-library-resources-generated.js
pack-library-resources-generated.js
1 change: 1 addition & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
plugins {
alias(libs.plugins.org.jetbrains.kotlin.multiplatform) apply false
alias(libs.plugins.compose.compiler) apply false
alias(libs.plugins.org.jetbrains.compose) apply false
alias(libs.plugins.com.android.library) apply false
alias(libs.plugins.com.android.application) apply false
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
org.gradle.jvmargs=-Xmx1536m
# Kotlin build config
kotlin.code.style=official
kotlin.mpp.androidSourceSetLayoutVersion=2
android.useAndroidX=true
kotlin.js.yarn=false


org.jetbrains.compose.experimental.jscanvas.enabled=true
Expand Down
17 changes: 9 additions & 8 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,27 @@
org-jetbrains-kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
com-android-library = { id = "com.android.library", version.ref = "agp" }
com-android-application = { id = "com.android.application", version.ref = "agp" }
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
org-jetbrains-compose = { id = "org.jetbrains.compose", version.ref = "compose-jb" }
com-vanniktech-maven-publish = { id = "com.vanniktech.maven.publish", version.ref = "vanniktech-publish" }
dev-icerock-mobile-multiplatform-resources = { id = "dev.icerock.mobile.multiplatform-resources", version.ref = "multiplatform-resources" }
org-kodein-mock-mockmp = { id = "org.kodein.mock.mockmp", version.ref = "mockmp" }

[versions]

kotlin = "1.9.22"
kotlin = "2.0.0"
agp = "8.2.2"
compose-jb = "1.5.12"
compose-jb = "1.6.11"
vanniktech-publish = "0.27.0"
okio = "3.7.0"
multiplatform-resources = "0.24.0-alpha-3"
okio = "3.9.0"
multiplatform-resources = "0.24.0"
mockmp = "1.17.0"
kermit = "2.0.3"
kermit = "2.0.4"

androidx-activity = "1.8.2"
androidx-lifecycle = "2.7.0"
androidx-activity = "1.9.0"
androidx-lifecycle = "2.8.1"
androidx-startup = "1.1.1"
androidx-appcompat = "1.6.1"
androidx-appcompat = "1.7.0"
androidx-runner = "1.5.2"

[libraries]
Expand Down
4 changes: 3 additions & 1 deletion gradle/pack-library-resources.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
val rootProjectAbsPath = rootProject.projectDir.absolutePath
val path = """"$rootProjectAbsPath/sample/build/generated/moko-resources/jsMain/res""""
val path = """"$rootProjectAbsPath/libphonenumber/build/processedResources/js/main""""
val webpackConfig = File(projectDir, "webpack.config.d/pack-library-resources-generated.js")

println("rootProjectAbsPath: $path")

fun createWebpackConfig() {
val configText = """const path = require('path');
Expand Down
Loading

0 comments on commit 5c716ef

Please sign in to comment.