Browse Source

Move to 0.2.0-build132

pull/154/head
Nikolay Igotti 4 years ago
parent
commit
84163e7499
  1. 2
      benchmarks/build.gradle.kts
  2. 2
      cef/build.gradle.kts
  3. 3
      ci/compose-uber-jar/gradle.properties
  4. 2
      examples/codeviewer/build.gradle.kts
  5. 2
      examples/imageviewer/build.gradle.kts
  6. 2
      examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt
  7. 2
      gradle-plugins/gradle.properties
  8. 2
      templates/desktop-template/build.gradle.kts
  9. 8
      templates/desktop-template/build_and_run_from_cli_example.sh
  10. 2
      templates/multiplatform-template/build.gradle.kts

2
benchmarks/build.gradle.kts

@ -6,7 +6,7 @@ plugins {
// __KOTLIN_COMPOSE_VERSION__ // __KOTLIN_COMPOSE_VERSION__
kotlin("jvm") version "1.4.20" kotlin("jvm") version "1.4.20"
// __LATEST_COMPOSE_RELEASE_VERSION__ // __LATEST_COMPOSE_RELEASE_VERSION__
id("org.jetbrains.compose") version "0.2.0-build128" id("org.jetbrains.compose") version "0.2.0-build132"
// __KOTLIN_COMPOSE_VERSION__ // __KOTLIN_COMPOSE_VERSION__
kotlin("plugin.allopen") version "1.4.20" kotlin("plugin.allopen") version "1.4.20"
id("kotlinx.benchmark") version "0.2.0-dev-20" id("kotlinx.benchmark") version "0.2.0-dev-20"

2
cef/build.gradle.kts

@ -4,7 +4,9 @@ import de.undercouch.gradle.tasks.download.Download
import kotlin.text.capitalize import kotlin.text.capitalize
plugins { plugins {
// __KOTLIN_COMPOSE_VERSION__
kotlin("jvm") version "1.4.0" kotlin("jvm") version "1.4.0"
// __LATEST_COMPOSE_RELEASE_VERSION__
id("org.jetbrains.compose") version "0.1.0-dev97" id("org.jetbrains.compose") version "0.1.0-dev97"
id("de.undercouch.download") version "4.1.1" id("de.undercouch.download") version "4.1.1"
application application

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

@ -1,2 +1,3 @@
compose.version=0.1.0-build63 # __LATEST_COMPOSE_RELEASE_VERSION__
compose.version=0.2.0-build132
kotlin.code.style=official kotlin.code.style=official

2
examples/codeviewer/build.gradle.kts

@ -9,7 +9,7 @@ buildscript {
dependencies { dependencies {
// __LATEST_COMPOSE_RELEASE_VERSION__ // __LATEST_COMPOSE_RELEASE_VERSION__
classpath("org.jetbrains.compose:compose-gradle-plugin:0.2.0-build128") classpath("org.jetbrains.compose:compose-gradle-plugin:0.2.0-build132")
classpath("com.android.tools.build:gradle:4.0.1") classpath("com.android.tools.build:gradle:4.0.1")
classpath(kotlin("gradle-plugin", version = "1.4.20")) classpath(kotlin("gradle-plugin", version = "1.4.20"))
} }

2
examples/imageviewer/build.gradle.kts

@ -11,7 +11,7 @@ buildscript {
dependencies { dependencies {
// __LATEST_COMPOSE_RELEASE_VERSION__ // __LATEST_COMPOSE_RELEASE_VERSION__
classpath("org.jetbrains.compose:compose-gradle-plugin:0.2.0-build128") classpath("org.jetbrains.compose:compose-gradle-plugin:0.2.0-build132")
classpath("com.android.tools.build:gradle:4.0.1") classpath("com.android.tools.build:gradle:4.0.1")
// __KOTLIN_COMPOSE_VERSION__ // __KOTLIN_COMPOSE_VERSION__
classpath(kotlin("gradle-plugin", version = "1.4.20")) classpath(kotlin("gradle-plugin", version = "1.4.20"))

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

@ -12,7 +12,7 @@ object Deps {
object Compose { object Compose {
// __LATEST_COMPOSE_RELEASE_VERSION__ // __LATEST_COMPOSE_RELEASE_VERSION__
private const val VERSION = "0.2.0-build128" private const val VERSION = "0.2.0-build132"
const val gradlePlugin = "org.jetbrains.compose:compose-gradle-plugin:$VERSION" const val gradlePlugin = "org.jetbrains.compose:compose-gradle-plugin:$VERSION"
} }
} }

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=0.2.0-build128 compose.version=0.2.0-build132
# A version of Gradle plugin, that will be published, # A version of Gradle plugin, that will be published,
# unless overridden by COMPOSE_GRADLE_PLUGIN_VERSION env var. # unless overridden by COMPOSE_GRADLE_PLUGIN_VERSION env var.

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

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

8
templates/desktop-template/build_and_run_from_cli_example.sh

@ -18,15 +18,15 @@ function mavenDep {
fi fi
} }
PLATFORM=macos PLATFORM=macos-x64
SKIKO_VERSION=0.1.16 SKIKO_VERSION=0.1.18
# __KOTLIN_COMPOSE_VERSION__ # __KOTLIN_COMPOSE_VERSION__
KOTLIN_VERSION=1.4.20 KOTLIN_VERSION=1.4.20
# __LATEST_COMPOSE_RELEASE_VERSION__ # __LATEST_COMPOSE_RELEASE_VERSION__
COMPOSE_VERSION=0.2.0-build128 COMPOSE_VERSION=0.2.0-build132
COROUTINES_VERSION=1.3.6 COROUTINES_VERSION=1.3.6
COLLECTIONS_VERSION=0.3 COLLECTIONS_VERSION=0.3
SPACE_REPO="https://packages.jetbrains.team/maven/p/ui/dev" SPACE_REPO="https://public.jetbrains.space/p/compose/packages/maven/"
MAVEN_CENTRAL="https://repo1.maven.org/maven2" MAVEN_CENTRAL="https://repo1.maven.org/maven2"
BINTRAY_KOTLINX="https://dl.bintray.com/kotlin/kotlinx" BINTRAY_KOTLINX="https://dl.bintray.com/kotlin/kotlinx"

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") ?: "0.2.0-build128" val composeVersion = System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.2.0-build132"
repositories { repositories {
// TODO: remove after new build is published // TODO: remove after new build is published

Loading…
Cancel
Save