Browse Source

Move compose + use kotlin 1.6.21 (#2025)

* Move compose

* Update kotlin version to 1.6.20

* Move compose + Update kotlin version to 1.6.21

* Move compose to include a fix for compose plugin (kjs specific)

Co-authored-by: Oleksandr Karpovich <oleksandr.karpovich@jetbrains.com>
pull/2027/head
Oleksandr Karpovich 3 years ago committed by GitHub
parent
commit
e69ac23dbf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      components/gradle.properties
  2. 2
      compose/frameworks/support
  3. 2
      experimental/examples/falling-balls-mpp/gradle.properties
  4. 2
      templates/desktop-template/gradle.properties
  5. 2
      templates/multiplatform-template/gradle.properties
  6. 2
      templates/web-template/gradle.properties
  7. 2
      web/build.gradle.kts
  8. 4
      web/buildSrc/build.gradle.kts
  9. 2
      web/compose-compiler-integration/main-template/build.gradle.kts
  10. 2
      web/settings.gradle.kts
  11. 2
      web/test-utils/conf/karma-kotlin-runner-decorator/karma-kotlin-reporter-decorated.js

2
components/gradle.properties

@ -3,6 +3,6 @@ android.useAndroidX=true
android.enableJetifier=true android.enableJetifier=true
kotlin.code.style=official kotlin.code.style=official
# __KOTLIN_COMPOSE_VERSION__ # __KOTLIN_COMPOSE_VERSION__
kotlin.version=1.6.10 kotlin.version=1.6.21
# __LATEST_COMPOSE_RELEASE_VERSION__ # __LATEST_COMPOSE_RELEASE_VERSION__
compose.version=1.1.0 compose.version=1.1.0

2
compose/frameworks/support

@ -1 +1 @@
Subproject commit f4b9436637e0391351984ebfa5470ff77051815e Subproject commit 5f528e84a04008c5c0b037980a5d44ec42d5f0d3

2
experimental/examples/falling-balls-mpp/gradle.properties

@ -1,6 +1,6 @@
org.gradle.jvmargs=-Xmx3g org.gradle.jvmargs=-Xmx3g
compose.version=1.2.0-alpha01-dev620 compose.version=1.2.0-alpha01-dev620
kotlin.version=1.6.10 kotlin.version=1.6.21
kotlin.code.style=official kotlin.code.style=official
kotlin.native.cacheKind=none kotlin.native.cacheKind=none
kotlin.native.useEmbeddableCompilerJar=true kotlin.native.useEmbeddableCompilerJar=true

2
templates/desktop-template/gradle.properties

@ -1,4 +1,4 @@
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
kotlin.code.style=official kotlin.code.style=official
kotlin.version=1.6.10 kotlin.version=1.6.21
compose.version=1.1.0 compose.version=1.1.0

2
templates/multiplatform-template/gradle.properties

@ -2,6 +2,6 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
android.useAndroidX=true android.useAndroidX=true
android.enableJetifier=true android.enableJetifier=true
kotlin.code.style=official kotlin.code.style=official
kotlin.version=1.6.10 kotlin.version=1.6.21
agp.version=7.0.4 agp.version=7.0.4
compose.version=1.1.0 compose.version=1.1.0

2
templates/web-template/gradle.properties

@ -1,4 +1,4 @@
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
kotlin.code.style=official kotlin.code.style=official
kotlin.version=1.6.10 kotlin.version=1.6.21
compose.version=1.1.0 compose.version=1.1.0

2
web/build.gradle.kts

@ -42,7 +42,7 @@ subprojects {
project.kotlinExtension.targets.forEach { target -> project.kotlinExtension.targets.forEach { target ->
target.compilations.forEach { compilation -> target.compilations.forEach { compilation ->
compilation.kotlinOptions { compilation.kotlinOptions {
allWarningsAsErrors = true allWarningsAsErrors = false
// see https://kotlinlang.org/docs/opt-in-requirements.html // see https://kotlinlang.org/docs/opt-in-requirements.html
freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn" freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
} }

4
web/buildSrc/build.gradle.kts

@ -10,7 +10,7 @@ repositories {
} }
plugins { plugins {
id("org.jetbrains.kotlin.jvm") version "1.6.10" id("org.jetbrains.kotlin.jvm") version "1.6.21"
} }
@ -20,5 +20,5 @@ java {
} }
dependencies { dependencies {
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10") implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21")
} }

2
web/compose-compiler-integration/main-template/build.gradle.kts

@ -1,5 +1,5 @@
plugins { plugins {
kotlin("multiplatform") version "1.6.10" kotlin("multiplatform") version "1.6.21"
id("org.jetbrains.compose") id("org.jetbrains.compose")
} }

2
web/settings.gradle.kts

@ -44,7 +44,7 @@ pluginManagement {
if (requested.id.id == "org.jetbrains.compose") { if (requested.id.id == "org.jetbrains.compose") {
useModule("org.jetbrains.compose:org.jetbrains.compose.gradle.plugin:$COMPOSE_CORE_VERSION") useModule("org.jetbrains.compose:org.jetbrains.compose.gradle.plugin:$COMPOSE_CORE_VERSION")
} else if (requested.id.id == "org.jetbrains.kotlin.multiplatform") { } else if (requested.id.id == "org.jetbrains.kotlin.multiplatform") {
useModule("org.jetbrains.kotlin.multiplatform:org.jetbrains.kotlin.multiplatform.gradle.plugin:1.6.10") useModule("org.jetbrains.kotlin.multiplatform:org.jetbrains.kotlin.multiplatform.gradle.plugin:1.6.21")
} }
} }
} }

2
web/test-utils/conf/karma-kotlin-runner-decorator/karma-kotlin-reporter-decorated.js

@ -3,7 +3,7 @@
// logger is needed only to log cases when `browser.id` is not in browserResults // logger is needed only to log cases when `browser.id` is not in browserResults
const logger = require('../../../build/js/node_modules/karma/lib/logger') const logger = require('../../../build/js/node_modules/karma/lib/logger')
const kotlinReporterModule = require("../../../build/js/packages_imported/kotlin-test-js-runner/1.6.10/karma-kotlin-reporter"); const kotlinReporterModule = require("../../../build/js/packages_imported/kotlin-test-js-runner/1.6.21/karma-kotlin-reporter");
const KotlinReporter = kotlinReporterModule['reporter:karma-kotlin-reporter'][1]; const KotlinReporter = kotlinReporterModule['reporter:karma-kotlin-reporter'][1];

Loading…
Cancel
Save