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.

Sign up for GitHub

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

chore: Update dependencies (JetBrains Compose 1.6.0) #107

Merged
merged 1 commit into from
Mar 2, 2024
Merged

chore: Update dependencies (JetBrains Compose 1.6.0) #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
78 changes: 40 additions & 38 deletions convention-plugins/src/main/kotlin/convention.multiplatform.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,40 @@
//import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
//
//plugins {
// kotlin("multiplatform")
// id("org.jetbrains.compose")
//}
//
//val baseName: String by extra
//
//@OptIn(ExperimentalKotlinGradlePluginApi::class)
//kotlin {
// jvm("desktop")
//
// androidTarget {
// compilations.all {
// kotlinOptions {
// jvmTarget = "11"
// }
// }
// publishLibraryVariants("release")
// }
//
// listOf(
// iosX64(),
// iosArm64(),
// iosSimulatorArm64(),
// ).forEach {
// it.binaries.framework {
// this.baseName = baseName
// }
// }
//
// js(IR) {
// browser()
// }
//
// explicitApi()
//}
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi

plugins {
kotlin("multiplatform")
id("org.jetbrains.compose")
}

val baseName: String by extra

@OptIn(ExperimentalKotlinGradlePluginApi::class)
kotlin {
applyDefaultHierarchyTemplate()

jvm("desktop")

androidTarget {
compilations.all {
kotlinOptions {
jvmTarget = "11"
}
}
publishLibraryVariants("release")
}

listOf(
iosX64(),
iosArm64(),
iosSimulatorArm64(),
).forEach {
it.binaries.framework {
this.baseName = baseName
}
}

js(IR) {
browser()
}

explicitApi()
}
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
android-gradle-plugin = "8.3.0"
androidx-activity = "1.8.2"
androidx-compose-bom = "2024.02.01" # https://developer.android.com/jetpack/compose/bom/bom-mapping
androidx-compose-compiler = "1.5.9" # https://developer.android.com/jetpack/androidx/releases/compose-kotlin#pre-release_kotlin_compatibility
jetbrains-compose = "1.5.12"
androidx-compose-compiler = "1.5.10" # https://developer.android.com/jetpack/androidx/releases/compose-kotlin#pre-release_kotlin_compatibility
jetbrains-compose = "1.6.0"
kotlin = "1.9.22"

[libraries]
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
35 changes: 2 additions & 33 deletions reveal-common/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,44 +1,13 @@
plugins {
// id("convention.multiplatform")
kotlin("multiplatform")
id("org.jetbrains.compose")
id("convention.publication")
alias(libs.plugins.android.library)
id("convention.multiplatform")
id("convention.publication")
}

val baseName by extra { "reveal-common" }
val publicationName by extra { "Reveal (Common)" }

// TODO: Use convention plugin when 1.6 was released
// /~https://github.com/JetBrains/compose-multiplatform/issues/3933
kotlin {
applyDefaultHierarchyTemplate()

jvm("desktop")

androidTarget {
compilations.all {
kotlinOptions {
jvmTarget = "11"
}
}
publishLibraryVariants("release")
}

listOf(
iosX64(),
iosArm64(),
iosSimulatorArm64(),
).forEach {
it.binaries.framework {
this.baseName = baseName
}
}

js(IR) {
browser()
}

sourceSets {
val commonMain by getting {
dependencies {
Expand Down
35 changes: 2 additions & 33 deletions reveal-core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,44 +1,13 @@
plugins {
// id("convention.multiplatform")
kotlin("multiplatform")
id("org.jetbrains.compose")
id("convention.publication")
alias(libs.plugins.android.library)
id("convention.multiplatform")
id("convention.publication")
}

val baseName by extra { "reveal-core" }
val publicationName by extra { "Reveal (Core)" }

// TODO: Use convention plugin when 1.6 was released
// /~https://github.com/JetBrains/compose-multiplatform/issues/3933
kotlin {
applyDefaultHierarchyTemplate()

jvm("desktop")

androidTarget {
compilations.all {
kotlinOptions {
jvmTarget = "11"
}
}
publishLibraryVariants("release")
}

listOf(
iosX64(),
iosArm64(),
iosSimulatorArm64(),
).forEach {
it.binaries.framework {
this.baseName = baseName
}
}

js(IR) {
browser()
}

sourceSets {
val commonMain by getting {
dependencies {
Expand Down
35 changes: 2 additions & 33 deletions reveal-shapes/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,44 +1,13 @@
plugins {
// id("convention.multiplatform")
kotlin("multiplatform")
id("org.jetbrains.compose")
id("convention.publication")
alias(libs.plugins.android.library)
id("convention.multiplatform")
id("convention.publication")
}

val baseName by extra { "reveal-shapes" }
val publicationName by extra { "Reveal (Shapes)" }

// TODO: Use convention plugin when 1.6 was released
// /~https://github.com/JetBrains/compose-multiplatform/issues/3933
kotlin {
applyDefaultHierarchyTemplate()

jvm("desktop")

androidTarget {
compilations.all {
kotlinOptions {
jvmTarget = "11"
}
}
publishLibraryVariants("release")
}

listOf(
iosX64(),
iosArm64(),
iosSimulatorArm64(),
).forEach {
it.binaries.framework {
this.baseName = baseName
}
}

js(IR) {
browser()
}

sourceSets {
val commonMain by getting {
dependencies {
Expand Down
Loading