jlengrand/compose-multiplatform
1
0
Fork 0
mirror of https://github.com/jlengrand/compose-multiplatform.git synced 2026-03-10 08:11:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move to 0.3.0-rc1 (#410)

Browse Source
This commit is contained in:
Nikolay Igotti
2021-02-21 13:26:51 +03:00
committed by GitHub
parent c2e0274a98
commit c58018221e
25 changed files with 60 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ci/compose-uber-jar/gradle.properties
View File

@@ -1,3 +1,3 @@
# __LATEST_COMPOSE_RELEASE_VERSION__
compose.version=0.2.0-build132
compose.version=0.3.0-rc1
kotlin.code.style=official

8
examples/codeviewer/android/build.gradle.kts
View File

@@ -22,11 +22,5 @@ android {
dependencies {
implementation(project(":common"))
implementation("androidx.activity:activity-compose:1.3.0-alpha02") {
exclude(group = "androidx.compose.animation")
exclude(group = "androidx.compose.foundation")
exclude(group = "androidx.compose.material")
exclude(group = "androidx.compose.runtime")
exclude(group = "androidx.compose.ui")
}
implementation("androidx.activity:activity-compose:1.3.0-alpha02")
}

2
examples/codeviewer/build.gradle.kts
View File

@@ -9,7 +9,7 @@ buildscript {
dependencies {
// __LATEST_COMPOSE_RELEASE_VERSION__
classpath("org.jetbrains.compose:compose-gradle-plugin:0.3.0-build154")
classpath("org.jetbrains.compose:compose-gradle-plugin:0.3.0-rc1")
classpath("com.android.tools.build:gradle:4.0.1")
// __KOTLIN_COMPOSE_VERSION__
classpath(kotlin("gradle-plugin", version = "1.4.30"))

1
examples/codeviewer/desktop/build.gradle.kts
View File

@@ -25,6 +25,7 @@ compose.desktop {
nativeDistributions {
targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
packageName = "ComposeCodeViewer"
packageVersion = "1.0.0"
windows {
menu = true

3
examples/falling_balls/build.gradle.kts
View File

@@ -6,7 +6,7 @@ plugins {
// __KOTLIN_COMPOSE_VERSION__
kotlin("jvm") version "1.4.30"
// __LATEST_COMPOSE_RELEASE_VERSION__
id("org.jetbrains.compose") version "0.3.0-build154"
id("org.jetbrains.compose") version "0.3.0-rc1"
}
group = "me.user"
@@ -32,6 +32,7 @@ compose.desktop {
nativeDistributions {
targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
packageName = "falling_balls"
packageVersion = "1.0.0"
}
}
}

8
examples/imageviewer/android/build.gradle.kts
View File

@@ -22,11 +22,5 @@ android {
dependencies {
implementation(project(":common"))
implementation("androidx.activity:activity-compose:1.3.0-alpha02") {
exclude(group = "androidx.compose.animation")
exclude(group = "androidx.compose.foundation")
exclude(group = "androidx.compose.material")
exclude(group = "androidx.compose.runtime")
exclude(group = "androidx.compose.ui")
}
implementation("androidx.activity:activity-compose:1.3.0-alpha02")
}

2
examples/imageviewer/build.gradle.kts
View File

@@ -11,7 +11,7 @@ buildscript {
dependencies {
// __LATEST_COMPOSE_RELEASE_VERSION__
classpath("org.jetbrains.compose:compose-gradle-plugin:0.3.0-build154")
classpath("org.jetbrains.compose:compose-gradle-plugin:0.3.0-rc1")
classpath("com.android.tools.build:gradle:4.0.1")
// __KOTLIN_COMPOSE_VERSION__
classpath(kotlin("gradle-plugin", version = "1.4.30"))

2
examples/imageviewer/desktop/build.gradle.kts
View File

@@ -27,6 +27,8 @@ compose.desktop {
nativeDistributions {
targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
packageName = "ImageViewer"
packageVersion = "1.0.0"
modules("jdk.crypto.ec")
val iconsRoot = project.file("../common/src/desktopMain/resources/images")

3
examples/intelliJPlugin/build.gradle.kts
View File

@@ -4,7 +4,8 @@ plugins {
id("org.jetbrains.intellij") version "0.6.5"
java
kotlin("jvm") version "1.4.30"
id("org.jetbrains.compose") version "0.3.0-build154"
// __LATEST_COMPOSE_RELEASE_VERSION__
id("org.jetbrains.compose") version "0.3.0-rc1"
}
group = "org.example"

8
examples/issues/android/build.gradle.kts
View File

@@ -22,11 +22,5 @@ android {
dependencies {
implementation(project(":common"))
implementation("androidx.activity:activity-compose:1.3.0-alpha02") {
exclude(group = "androidx.compose.animation")
exclude(group = "androidx.compose.foundation")
exclude(group = "androidx.compose.material")
exclude(group = "androidx.compose.runtime")
exclude(group = "androidx.compose.ui")
}
implementation("androidx.activity:activity-compose:1.3.0-alpha02")
}

2
examples/issues/build.gradle.kts
View File

@@ -9,7 +9,7 @@ buildscript {
dependencies {
// __LATEST_COMPOSE_RELEASE_VERSION__
classpath("org.jetbrains.compose:compose-gradle-plugin:0.3.0-build154")
classpath("org.jetbrains.compose:compose-gradle-plugin:0.3.0-rc1")
classpath("com.android.tools.build:gradle:4.0.1")
// __KOTLIN_COMPOSE_VERSION__
classpath(kotlin("gradle-plugin", version = "1.4.30"))

1
examples/issues/desktop/build.gradle.kts
View File

@@ -27,6 +27,7 @@ compose.desktop {
nativeDistributions {
targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
packageName = "IssuesViewer"
packageVersion = "1.0.0"
windows {
menu = true

19
examples/todoapp/android/build.gradle.kts
View File

@@ -37,15 +37,16 @@ dependencies {
implementation(Deps.ArkIvanov.MVIKotlin.mvikotlinLogging)
implementation(Deps.ArkIvanov.MVIKotlin.mvikotlinTimeTravel)
implementation(Deps.ArkIvanov.Decompose.decompose)
implementation(Deps.ArkIvanov.Decompose.extensionsCompose)
implementation(Deps.ArkIvanov.Decompose.extensionsCompose) {
// TODO remove when we will not be using 0.0.0-unmerged version
exclude(group = "org.jetbrains.compose.desktop")
exclude(group = "org.jetbrains.compose.animation")
exclude(group = "org.jetbrains.compose.foundation")
exclude(group = "org.jetbrains.compose.material")
exclude(group = "org.jetbrains.compose.runtime")
exclude(group = "org.jetbrains.compose.ui")
}
implementation(Deps.AndroidX.AppCompat.appCompat)
implementation(Deps.AndroidX.Activity.activityCompose) {
// Workaround as per https://github.com/JetBrains/compose-jb/issues/354#issuecomment-777122304
exclude(group = "androidx.compose.animation")
exclude(group = "androidx.compose.foundation")
exclude(group = "androidx.compose.material")
exclude(group = "androidx.compose.runtime")
exclude(group = "androidx.compose.ui")
}
implementation(Deps.AndroidX.Activity.activityCompose)
}

3
examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt
View File

@@ -12,7 +12,8 @@ object Deps {
object Compose {
// __LATEST_COMPOSE_RELEASE_VERSION__
private const val VERSION = "0.3.0-build152"
// TODO remove exclude(group = "org.jetbrains.compose.desktop")
private const val VERSION = "0.3.0-rc1"
const val gradlePlugin = "org.jetbrains.compose:compose-gradle-plugin:$VERSION"
}
}

10
examples/todoapp/common/compose-ui/build.gradle.kts
View File

@@ -11,7 +11,15 @@ kotlin {
implementation(project(":common:edit"))
implementation(project(":common:root"))
implementation(Deps.ArkIvanov.Decompose.decompose)
implementation(Deps.ArkIvanov.Decompose.extensionsCompose)
implementation(Deps.ArkIvanov.Decompose.extensionsCompose) {
// TODO remove when we will not be using 0.0.0-unmerged version
exclude(group = "org.jetbrains.compose.desktop")
exclude(group = "org.jetbrains.compose.animation")
exclude(group = "org.jetbrains.compose.foundation")
exclude(group = "org.jetbrains.compose.material")
exclude(group = "org.jetbrains.compose.runtime")
exclude(group = "org.jetbrains.compose.ui")
}
}
}
}

12
examples/todoapp/desktop/build.gradle.kts
View File

@@ -20,7 +20,15 @@ kotlin {
implementation(project(":common:root"))
implementation(project(":common:compose-ui"))
implementation(Deps.ArkIvanov.Decompose.decompose)
implementation(Deps.ArkIvanov.Decompose.extensionsCompose)
implementation(Deps.ArkIvanov.Decompose.extensionsCompose) {
// TODO remove when we will not be using 0.0.0-unmerged version
exclude(group = "org.jetbrains.compose.desktop")
exclude(group = "org.jetbrains.compose.animation")
exclude(group = "org.jetbrains.compose.foundation")
exclude(group = "org.jetbrains.compose.material")
exclude(group = "org.jetbrains.compose.runtime")
exclude(group = "org.jetbrains.compose.ui")
}
implementation(Deps.ArkIvanov.MVIKotlin.mvikotlin)
implementation(Deps.ArkIvanov.MVIKotlin.mvikotlinMain)
implementation(Deps.Badoo.Reaktive.reaktive)
@@ -37,6 +45,8 @@ compose.desktop {
nativeDistributions {
targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
packageName = "ComoseDesktopTodo"
packageVersion = "1.0.0"
modules("java.sql")
windows {

2
examples/todoapp/desktop/src/jvmMain/kotlin/example/todo/desktop/Main.kt
View File

@@ -1,5 +1,6 @@
package example.todo.desktop
import androidx.compose.desktop.AppWindow
import androidx.compose.desktop.DesktopTheme
import androidx.compose.desktop.Window
import androidx.compose.foundation.layout.fillMaxSize
@@ -18,6 +19,7 @@ import example.todo.common.root.TodoRoot
import example.todo.common.ui.TodoRootContent
import example.todo.database.TodoDatabase
import kotlinx.coroutines.Dispatchers
import javax.swing.SwingUtilities
fun main() {
overrideSchedulers(main = Dispatchers.Main::asScheduler)

8
examples/widgetsgallery/android/build.gradle.kts
View File

@@ -22,11 +22,5 @@ android {
dependencies {
implementation(project(":common"))
implementation("androidx.activity:activity-compose:1.3.0-alpha02") {
exclude(group = "androidx.compose.animation")
exclude(group = "androidx.compose.foundation")
exclude(group = "androidx.compose.material")
exclude(group = "androidx.compose.runtime")
exclude(group = "androidx.compose.ui")
}
implementation("androidx.activity:activity-compose:1.3.0-alpha02")
}

2
examples/widgetsgallery/build.gradle.kts
View File

@@ -9,7 +9,7 @@ buildscript {
dependencies {
// __LATEST_COMPOSE_RELEASE_VERSION__
classpath("org.jetbrains.compose:compose-gradle-plugin:0.3.0-build154")
classpath("org.jetbrains.compose:compose-gradle-plugin:0.3.0-rc1")
classpath("com.android.tools.build:gradle:4.0.1")
// __KOTLIN_COMPOSE_VERSION__
classpath(kotlin("gradle-plugin", version = "1.4.30"))

1
examples/widgetsgallery/desktop/build.gradle.kts
View File

@@ -28,6 +28,7 @@ compose.desktop {
nativeDistributions {
targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
packageName = "ComposeWidgetsGallery"
packageVersion = "1.0.0"
windows {
menu = true

2
gradle-plugins/gradle.properties
View File

@@ -6,7 +6,7 @@ kotlin.code.style=official
# unless overridden by COMPOSE_GRADLE_PLUGIN_COMPOSE_VERSION env var.
#
# __LATEST_COMPOSE_RELEASE_VERSION__
compose.version=0.2.0-build132
compose.version=0.3.0-rc1
# A version of Gradle plugin, that will be published,
# unless overridden by COMPOSE_GRADLE_PLUGIN_VERSION env var.

3
templates/desktop-template/build.gradle.kts
View File

@@ -5,7 +5,7 @@ plugins {
// __KOTLIN_COMPOSE_VERSION__
kotlin("jvm") version "1.4.30"
// __LATEST_COMPOSE_RELEASE_VERSION__
id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.3.0-build153")
id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.3.0-rc1")
}
repositories {
@@ -24,6 +24,7 @@ compose.desktop {
nativeDistributions {
targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
packageName = "KotlinJvmComposeDesktopApplication"
packageVersion = "1.0.0"
}
}
}

2
templates/multiplatform-template/build.gradle.kts
View File

@@ -1,6 +1,6 @@
buildscript {
// __LATEST_COMPOSE_RELEASE_VERSION__
val composeVersion = System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.3.0-build150"
val composeVersion = System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.3.0-rc1"
repositories {
// TODO: remove after new build is published

1
templates/multiplatform-template/desktop/build.gradle.kts
View File

@@ -27,6 +27,7 @@ compose.desktop {
nativeDistributions {
targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
packageName = "KotlinMultiplatformComposeDesktopApplication"
packageVersion = "1.0.0"
}
}
}

3
tools/replace.sh Executable file
View File

@@ -0,0 +1,3 @@
OLDVER=0.0.0-unmerged-build39
NEWVER=0.3.0-rc1
find -E ../ -regex '.*\.(kts|properties|kt)' -exec sed -i '' -e "s/$OLDVER/$NEWVER/g" {} \;