Browse Source

Move to 1.0.0-alpha1

pull/996/head
Nikolay Igotti 3 years ago
parent
commit
d499b350a2
  1. 4
      cef/build.gradle.kts
  2. 2
      cef/gradle/wrapper/gradle-wrapper.properties
  3. 3
      ci/compose-uber-jar/build.gradle.kts
  4. 2
      ci/compose-uber-jar/gradle.properties
  5. 2
      ci/compose-uber-jar/gradle/wrapper/gradle-wrapper.properties
  6. 2
      components/gradle.properties
  7. 2
      components/gradle/wrapper/gradle-wrapper.properties
  8. 2
      compose/frameworks/support
  9. 2
      compose/prebuilts/androidx/internal
  10. 2
      examples/codeviewer/build.gradle.kts
  11. 2
      examples/falling-balls/build.gradle.kts
  12. 2
      examples/imageviewer/build.gradle.kts
  13. 2
      examples/intellij-plugin/build.gradle.kts
  14. 2
      examples/issues/build.gradle.kts
  15. 2
      examples/notepad/build.gradle.kts
  16. 2
      examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt
  17. 2
      examples/web-compose-bird/build.gradle.kts
  18. 2
      examples/web-getting-started/build.gradle.kts
  19. 2
      examples/web-landing/build.gradle.kts
  20. 2
      examples/web-with-react/build.gradle.kts
  21. 2
      examples/widgets-gallery/build.gradle.kts
  22. 4
      idea-plugin/examples/simple-preview-example/build.gradle.kts
  23. 3
      templates/desktop-template/build.gradle.kts
  24. 2
      templates/multiplatform-template/build.gradle.kts
  25. 2
      templates/web-template/build.gradle.kts
  26. 8
      tutorials/Getting_Started/README.md
  27. 2
      web/buildSrc/build.gradle.kts
  28. 4
      web/gradle.properties

4
cef/build.gradle.kts

@ -5,9 +5,9 @@ import kotlin.text.capitalize
plugins {
// __KOTLIN_COMPOSE_VERSION__
kotlin("jvm") version "1.4.20"
kotlin("jvm") version "1.5.21"
// __LATEST_COMPOSE_RELEASE_VERSION__
id("org.jetbrains.compose") version "0.3.0-build133"
id("org.jetbrains.compose") version "1.0.0-alpha1"
id("de.undercouch.download") version "4.1.1"
application
}

2
cef/gradle/wrapper/gradle-wrapper.properties vendored

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

3
ci/compose-uber-jar/build.gradle.kts

@ -23,6 +23,7 @@ val composeVersion: String by lazy {
}
dependencies {
implementation("org.jetbrains.compose.desktop:desktop-jvm-macos-x64:$composeVersion")
implementation("org.jetbrains.compose.desktop:desktop-jvm-linux-x64:$composeVersion")
}
@ -82,4 +83,4 @@ class ComposeUberJarProperties {
inline fun <reified T> Project.typedProperty(name: String): T? =
project.findProperty(name) as? T
}
}
}

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

@ -1,3 +1,3 @@
# __LATEST_COMPOSE_RELEASE_VERSION__
compose.version=0.5.0-build262
compose.version=1.0.0-alpha1
kotlin.code.style=official

2
ci/compose-uber-jar/gradle/wrapper/gradle-wrapper.properties vendored

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

2
components/gradle.properties

@ -4,4 +4,4 @@ android.enableJetifier=true
kotlin.code.style=official
# __LATEST_COMPOSE_RELEASE_VERSION__
compose.version=0.5.0-build262
compose.version=1.0.0-alpha1

2
components/gradle/wrapper/gradle-wrapper.properties vendored

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

2
compose/frameworks/support

@ -1 +1 @@
Subproject commit 7ab919df67516862cc75a9f1880e85920fc93cb6
Subproject commit 9b5ede8dc435293ac09419421528921b8fed27fb

2
compose/prebuilts/androidx/internal

@ -1 +1 @@
Subproject commit 818a882ba70e8603d6a22b17d421c9049926da4c
Subproject commit f37dc6b42fe7838e9e37fbe8a9eb063a1550acd8

2
examples/codeviewer/build.gradle.kts

@ -8,7 +8,7 @@ buildscript {
dependencies {
// __LATEST_COMPOSE_RELEASE_VERSION__
classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0-alpha1-rc5")
classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0-alpha1")
classpath("com.android.tools.build:gradle:4.0.1")
// __KOTLIN_COMPOSE_VERSION__
classpath(kotlin("gradle-plugin", version = "1.5.21"))

2
examples/falling-balls/build.gradle.kts

@ -6,7 +6,7 @@ plugins {
// __KOTLIN_COMPOSE_VERSION__
kotlin("jvm") version "1.5.21"
// __LATEST_COMPOSE_RELEASE_VERSION__
id("org.jetbrains.compose") version "1.0.0-alpha1-rc5"
id("org.jetbrains.compose") version "1.0.0-alpha1"
}
group = "me.user"

2
examples/imageviewer/build.gradle.kts

@ -7,7 +7,7 @@ buildscript {
dependencies {
// __LATEST_COMPOSE_RELEASE_VERSION__
classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0-alpha1-rc5")
classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0-alpha1")
classpath("com.android.tools.build:gradle:4.1.0")
classpath(kotlin("gradle-plugin", version = "1.5.21"))
}

2
examples/intellij-plugin/build.gradle.kts

@ -5,7 +5,7 @@ plugins {
java
kotlin("jvm") version "1.5.21"
// __LATEST_COMPOSE_RELEASE_VERSION__
id("org.jetbrains.compose") version "1.0.0-alpha1-rc5"
id("org.jetbrains.compose") version "1.0.0-alpha1"
id("idea")
}

2
examples/issues/build.gradle.kts

@ -8,7 +8,7 @@ buildscript {
dependencies {
// __LATEST_COMPOSE_RELEASE_VERSION__
classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0-alpha1-rc5")
classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0-alpha1")
classpath("com.android.tools.build:gradle:4.1.0")
// __KOTLIN_COMPOSE_VERSION__
classpath(kotlin("gradle-plugin", version = "1.5.21"))

2
examples/notepad/build.gradle.kts

@ -5,7 +5,7 @@ plugins {
// __KOTLIN_COMPOSE_VERSION__
kotlin("jvm") version "1.5.21"
// __LATEST_COMPOSE_RELEASE_VERSION__
id("org.jetbrains.compose") version ("1.0.0-alpha1-rc5")
id("org.jetbrains.compose") version ("1.0.0-alpha1")
}
repositories {

2
examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt

@ -13,7 +13,7 @@ object Deps {
object Compose {
// __LATEST_COMPOSE_RELEASE_VERSION__
private const val VERSION = "1.0.0-alpha1-rc5"
private const val VERSION = "1.0.0-alpha1"
const val gradlePlugin = "org.jetbrains.compose:compose-gradle-plugin:$VERSION"
}
}

2
examples/web-compose-bird/build.gradle.kts

@ -1,6 +1,6 @@
plugins {
kotlin("multiplatform") version "1.5.21"
id("org.jetbrains.compose") version "1.0.0-alpha1-rc5"
id("org.jetbrains.compose") version "1.0.0-alpha1"
}
group = "com.theapache64.composebird"
version = "1.0.0-alpha01"

2
examples/web-getting-started/build.gradle.kts

@ -1,6 +1,6 @@
plugins {
kotlin("multiplatform") version "1.5.21"
id("org.jetbrains.compose") version "1.0.0-alpha1-rc5"
id("org.jetbrains.compose") version "1.0.0-alpha1"
}
repositories {

2
examples/web-landing/build.gradle.kts

@ -1,6 +1,6 @@
plugins {
kotlin("multiplatform") version "1.5.21"
id("org.jetbrains.compose") version "1.0.0-alpha1-rc5"
id("org.jetbrains.compose") version "1.0.0-alpha1"
}
repositories {

2
examples/web-with-react/build.gradle.kts

@ -1,6 +1,6 @@
plugins {
kotlin("multiplatform") version "1.5.21"
id("org.jetbrains.compose") version "1.0.0-alpha1-rc5"
id("org.jetbrains.compose") version "1.0.0-alpha1"
}
repositories {

2
examples/widgets-gallery/build.gradle.kts

@ -8,7 +8,7 @@ buildscript {
dependencies {
// __LATEST_COMPOSE_RELEASE_VERSION__
classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0-alpha1-rc5")
classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0-alpha1")
classpath("com.android.tools.build:gradle:7.0.0")
// __KOTLIN_COMPOSE_VERSION__
classpath(kotlin("gradle-plugin", version = "1.5.21"))

4
idea-plugin/examples/simple-preview-example/build.gradle.kts

@ -6,7 +6,7 @@ buildscript {
}
dependencies {
// __LATEST_COMPOSE_RELEASE_VERSION__
classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0-alpha1-rc1")
classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0-alpha1")
// __KOTLIN_COMPOSE_VERSION__
classpath(kotlin("gradle-plugin", version = "1.5.21"))
}
@ -19,4 +19,4 @@ subprojects {
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
google()
}
}
}

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

@ -5,7 +5,7 @@ plugins {
// __KOTLIN_COMPOSE_VERSION__
kotlin("jvm") version "1.5.21"
// __LATEST_COMPOSE_RELEASE_VERSION__
id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "1.0.0-alpha1-rc5")
id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "1.0.0-alpha1")
}
repositories {
@ -27,6 +27,7 @@ compose.desktop {
mainClass = "MainKt"
nativeDistributions {
appResourcesRootDir.set(project.layout.projectDirectory.dir("xxx"))
targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
packageName = "KotlinJvmComposeDesktopApplication"
packageVersion = "1.0.0"

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

@ -1,6 +1,6 @@
buildscript {
// __LATEST_COMPOSE_RELEASE_VERSION__
val composeVersion = System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "1.0.0-alpha1-rc5"
val composeVersion = System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "1.0.0-alpha1"
repositories {
mavenCentral()

2
templates/web-template/build.gradle.kts

@ -5,7 +5,7 @@ plugins {
// __KOTLIN_COMPOSE_VERSION__
kotlin("multiplatform") version "1.5.21"
// __LATEST_COMPOSE_RELEASE_VERSION__
id("org.jetbrains.compose") version ("1.0.0-alpha1-rc5")
id("org.jetbrains.compose") version ("1.0.0-alpha1")
}
repositories {

8
tutorials/Getting_Started/README.md

@ -40,11 +40,11 @@ just search for "Compose Multiplatform".
### Update the wizard plugin
The Сompose plugin version used in the wizard above may be not the last. Update the version of the plugin to the latest available by editing the `build.gradle.kts` file, finding and updating the version information as shown below. In this example the latest version of the plugin was 1.0.0-alpha1-rc1 and a compatible version of kotlin was 1.5.21. For the latest versions, see the [latest versions](https://github.com/JetBrains/compose-jb/releases) site and the [Kotlin](https://kotlinlang.org/) site.
The Сompose plugin version used in the wizard above may be not the last. Update the version of the plugin to the latest available by editing the `build.gradle.kts` file, finding and updating the version information as shown below. In this example the latest version of the plugin was 1.0.0-alpha1 and a compatible version of kotlin was 1.5.21. For the latest versions, see the [latest versions](https://github.com/JetBrains/compose-jb/releases) site and the [Kotlin](https://kotlinlang.org/) site.
```
plugins {
kotlin("jvm") version "1.5.21"
id("org.jetbrains.compose") version "1.0.0-alpha1-rc1"
id("org.jetbrains.compose") version "1.0.0-alpha1"
}
```
@ -80,7 +80,7 @@ import org.jetbrains.compose.compose
plugins {
kotlin("jvm") version "1.5.21"
id("org.jetbrains.compose") version "1.0.0-alpha1-rc1"
id("org.jetbrains.compose") version "1.0.0-alpha1"
}
repositories {
@ -159,4 +159,4 @@ updates the UI.
Running and debugging the `main()` function using run gutter is also supported.
![Application running](screen6.png)
![Application running](screen6.png)

2
web/buildSrc/build.gradle.kts

@ -10,5 +10,5 @@ repositories {
}
plugins {
id("org.jetbrains.kotlin.jvm") version "1.5.20"
id("org.jetbrains.kotlin.jvm") version "1.5.21"
}

4
web/gradle.properties

@ -1,6 +1,6 @@
# __LATEST_COMPOSE_RELEASE_VERSION__
COMPOSE_CORE_VERSION=1.0.0-alpha1-rc1
COMPOSE_WEB_VERSION=1.0.0-alpha1-rc1
COMPOSE_CORE_VERSION=1.0.0-alpha1
COMPOSE_WEB_VERSION=1.0.0-alpha1
COMPOSE_WEB_BUILD_WITH_EXAMPLES=false
compose.web.buildSamples=false
compose.web.tests.integration.withFirefox

Loading…
Cancel
Save