Skip to content

Commit

Permalink
Add compose-compiler plugin; update gitignore; update yarn lock
Browse files Browse the repository at this point in the history
  • Loading branch information
cedrickcooke committed May 31, 2024
1 parent 4f3996f commit dddf894
Show file tree
Hide file tree
Showing 6 changed files with 558 additions and 311 deletions.
11 changes: 6 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
*.iml
.DS_Store
.cxx
.externalNativeBuild
.gradle
/local.properties
/.idea
.DS_Store
build/
/.kotlin
/captures
.externalNativeBuild
.cxx
/local.properties
build/
6 changes: 1 addition & 5 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ plugins {
alias(libs.plugins.android.application) apply false
alias(libs.plugins.android.library) apply false
alias(libs.plugins.compose) apply false
alias(libs.plugins.compose.compiler) apply false
alias(libs.plugins.kotlinter) apply false
alias(libs.plugins.dokka)
alias(libs.plugins.maven.publish) apply false
Expand All @@ -36,8 +37,3 @@ allprojects {
}
}
}

// Remove this when we can update Kotlin/Compose to something that doesn't need the M1 workaround.
rootProject.plugins.withType<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin> {
rootProject.the<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension>().nodeVersion = "16.0.0"
}
1 change: 1 addition & 0 deletions compose/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
plugins {
id("com.android.library")
kotlin("multiplatform")
kotlin("plugin.compose")
id("org.jetbrains.compose")
id("org.jmailen.kotlinter")
jacoco
Expand Down
1 change: 1 addition & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ android-application = { id = "com.android.application", version.ref = "agp" }
android-library = { id = "com.android.library", version.ref = "agp" }
api = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.14.0" }
compose = { id = "org.jetbrains.compose", version.ref = "compose" }
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
dokka = { id = "org.jetbrains.dokka", version = "1.9.20" }
kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
kotlinter = { id = "org.jmailen.kotlinter", version = "4.3.0" }
Expand Down
Loading

0 comments on commit dddf894

Please sign in to comment.