Browse Source

Move examples to 1.0.0 (#1524)

feature/composite_override_version
Igor Demin 3 years ago committed by GitHub
parent
commit
559e9364f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      ci/compose-uber-jar/gradle.properties
  2. 2
      components/gradle.properties
  3. 2
      examples/codeviewer/build.gradle.kts
  4. 2
      examples/falling-balls-web/build.gradle.kts
  5. 2
      examples/falling-balls/build.gradle.kts
  6. 2
      examples/imageviewer/build.gradle.kts
  7. 2
      examples/intellij-plugin/build.gradle.kts
  8. 2
      examples/issues/build.gradle.kts
  9. 2
      examples/notepad/build.gradle.kts
  10. 2
      examples/todoapp-lite/build.gradle.kts
  11. 2
      examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt
  12. 2
      examples/web-compose-bird/build.gradle.kts
  13. 2
      examples/web-landing/build.gradle.kts
  14. 2
      examples/web-with-react/build.gradle.kts
  15. 2
      examples/widgets-gallery/build.gradle.kts
  16. 2
      experimental/components/gradle.properties
  17. 2
      experimental/lwjgl-integration/build.gradle.kts
  18. 2
      gradle-plugins/gradle.properties
  19. 2
      templates/desktop-template/build.gradle.kts
  20. 2
      templates/multiplatform-template/build.gradle.kts
  21. 2
      templates/web-template/build.gradle.kts
  22. 6
      tutorials/Getting_Started/README.md
  23. 2
      tutorials/Web/Getting_Started/README.md
  24. 4
      web/gradle.properties

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

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

2
components/gradle.properties

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

2
examples/codeviewer/build.gradle.kts

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

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

@ -4,7 +4,7 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat
plugins { plugins {
kotlin("multiplatform") version "1.5.31" kotlin("multiplatform") version "1.5.31"
id("org.jetbrains.compose") version "1.0.0-rc12" id("org.jetbrains.compose") version "1.0.0"
} }
version = "1.0-SNAPSHOT" version = "1.0-SNAPSHOT"

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

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

2
examples/imageviewer/build.gradle.kts

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

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

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

2
examples/issues/build.gradle.kts

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

2
examples/notepad/build.gradle.kts

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

2
examples/todoapp-lite/build.gradle.kts

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

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

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

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

@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
plugins { plugins {
kotlin("multiplatform") version "1.5.31" kotlin("multiplatform") version "1.5.31"
id("org.jetbrains.compose") version "1.0.0-rc12" id("org.jetbrains.compose") version "1.0.0"
} }
group = "com.theapache64.composebird" group = "com.theapache64.composebird"
version = "1.0.0-alpha01" version = "1.0.0-alpha01"

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

@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
plugins { plugins {
kotlin("multiplatform") version "1.5.31" kotlin("multiplatform") version "1.5.31"
id("org.jetbrains.compose") version "1.0.0-rc12" id("org.jetbrains.compose") version "1.0.0"
} }
repositories { repositories {

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

@ -1,7 +1,7 @@
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
plugins { plugins {
kotlin("multiplatform") version "1.5.31" kotlin("multiplatform") version "1.5.31"
id("org.jetbrains.compose") version "1.0.0-rc12" id("org.jetbrains.compose") version "1.0.0"
} }
repositories { repositories {

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

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

2
experimental/components/gradle.properties

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

2
experimental/lwjgl-integration/build.gradle.kts

@ -5,7 +5,7 @@ plugins {
// __KOTLIN_COMPOSE_VERSION__ // __KOTLIN_COMPOSE_VERSION__
kotlin("jvm") version "1.5.31" kotlin("jvm") version "1.5.31"
// __LATEST_COMPOSE_RELEASE_VERSION__ // __LATEST_COMPOSE_RELEASE_VERSION__
id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "1.0.0-rc12") id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "1.0.0")
} }
repositories { repositories {

2
gradle-plugins/gradle.properties

@ -6,7 +6,7 @@ kotlin.code.style=official
# unless overridden by COMPOSE_GRADLE_PLUGIN_COMPOSE_VERSION env var. # unless overridden by COMPOSE_GRADLE_PLUGIN_COMPOSE_VERSION env var.
# #
# __LATEST_COMPOSE_RELEASE_VERSION__ # __LATEST_COMPOSE_RELEASE_VERSION__
compose.version=1.0.0-rc12 compose.version=1.0.0
compose.with.web=false compose.with.web=false
# A version of Gradle plugin, that will be published, # A version of Gradle plugin, that will be published,

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

@ -5,7 +5,7 @@ plugins {
// __KOTLIN_COMPOSE_VERSION__ // __KOTLIN_COMPOSE_VERSION__
kotlin("jvm") version "1.5.31" kotlin("jvm") version "1.5.31"
// __LATEST_COMPOSE_RELEASE_VERSION__ // __LATEST_COMPOSE_RELEASE_VERSION__
id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "1.0.0-rc12") id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "1.0.0")
} }
repositories { repositories {

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

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

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

@ -6,7 +6,7 @@ plugins {
// __KOTLIN_COMPOSE_VERSION__ // __KOTLIN_COMPOSE_VERSION__
kotlin("multiplatform") version "1.5.31" kotlin("multiplatform") version "1.5.31"
// __LATEST_COMPOSE_RELEASE_VERSION__ // __LATEST_COMPOSE_RELEASE_VERSION__
id("org.jetbrains.compose") version ("1.0.0-rc12") id("org.jetbrains.compose") version ("1.0.0")
} }
repositories { repositories {

6
tutorials/Getting_Started/README.md

@ -40,11 +40,11 @@ just search for "Compose Multiplatform".
### Update the wizard plugin ### Update the wizard plugin
The Compose 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-rc12 and a compatible version of kotlin was 1.5.31. For the latest versions, see the [latest versions](https://github.com/JetBrains/compose-jb/releases) site and the [Kotlin](https://kotlinlang.org/) site. The Compose 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 and a compatible version of kotlin was 1.5.31. For the latest versions, see the [latest versions](https://github.com/JetBrains/compose-jb/releases) site and the [Kotlin](https://kotlinlang.org/) site.
``` ```
plugins { plugins {
kotlin("jvm") version "1.5.31" kotlin("jvm") version "1.5.31"
id("org.jetbrains.compose") version "1.0.0-rc12" id("org.jetbrains.compose") version "1.0.0"
} }
``` ```
@ -80,7 +80,7 @@ import org.jetbrains.compose.compose
plugins { plugins {
kotlin("jvm") version "1.5.31" kotlin("jvm") version "1.5.31"
id("org.jetbrains.compose") version "1.0.0-rc12" id("org.jetbrains.compose") version "1.0.0"
} }
repositories { repositories {

2
tutorials/Web/Getting_Started/README.md

@ -43,7 +43,7 @@ pluginManagement {
// Add compose gradle plugin // Add compose gradle plugin
plugins { plugins {
kotlin("multiplatform") version "1.5.31" kotlin("multiplatform") version "1.5.31"
id("org.jetbrains.compose") version "1.0.0-rc12" id("org.jetbrains.compose") version "1.0.0"
} }
// Add maven repositories // Add maven repositories

4
web/gradle.properties

@ -1,6 +1,6 @@
# __LATEST_COMPOSE_RELEASE_VERSION__ # __LATEST_COMPOSE_RELEASE_VERSION__
COMPOSE_CORE_VERSION=1.0.0-rc3 COMPOSE_CORE_VERSION=1.0.0
COMPOSE_WEB_VERSION=1.0.0-rc3 COMPOSE_WEB_VERSION=1.0.0
compose.web.buildSamples=false compose.web.buildSamples=false
compose.web.tests.integration.withFirefox compose.web.tests.integration.withFirefox
compose.web.tests.skip.benchmarks=false compose.web.tests.skip.benchmarks=false

Loading…
Cancel
Save