Browse Source

Release 1.2.2 (#2561)

* Compose 1.2.1-rc01

* Fix Web build for Kotlin 1.7.20

* Use 1.3.2.1-rc02 in Gradle plugin

* Fix Gradle Plugin tests

* Fix Gradle Plugin tests

* Compose 1.2.1-rc03

* Update CHANGELOG.md

* Update CHANGELOG.md

* Compose Compiler 1.3.2.1

* Compose 1.2.1

* Update VERSIONING.md

* Update gradle.properties

* Fix custom JDK tests on Linux

* Remove JVM target version override (#2515)

Previously, we were setting kotlin.jvmTarget version
to 1.8 if it was null or < 1.8.
As an unintended consequence we were also overriding
a version set by the jvmToolchain property.
So while users expected the jvmToolchain property
to set both jdk home & jdk target, we were quietly
overriding jdk target.

At the same time, Kotlin 1.7 sets the minimum
target version to 1.8 anyway, so our override
does not make sense with Kotlin 1.7+.

This commit removes overriding altogether.

Fixes #2511

* Update CHANGELOG.md

* Update CHANGELOG.md

* Update CHANGELOG.md

* Update Compose

* Update default ProGuard rules with changes from main branch

* Test Gradle plugin on relevant PRs (#2509)

* Update Gradle used in tooling subprojects

* Update Kotlin in Compose Gradle plugin

* Decrease verbosity of Gradle plugin tests

* Disable mac sign test

* Add workflow to test Gradle plugin

* Fix custom jdk tests on Linux

* Make Compose Gradle plugin build compatible with Configuration cache

* Print tests summary

* Remove unused code

* Refactor tests configuration

* Turn off parallel execution

* Try adding windows runner

* Turn off fail fast

* Fix Windows test issues

#2368

* Adjust default proguard rules

The following rule is needed to fix tests on Windows:
```
-dontwarn org.graalvm.compiler.core.aarch64.AArch64NodeMatchRules_MatchStatementSet*
```

Other rules are just to make builds less noisy.
Kotlin's `*.internal` packages often contain
bytecode, which triggers ProGuard's notes.
However, these notes are not actionable for
most users, so we can ignore notes by default.

#2393
# Conflicts:
#	gradle-plugins/gradle/wrapper/gradle-wrapper.properties

* Improve DSL for setting a custom Compose Plugin (#2527)

* Improve DSL for setting a custom Compose Plugin

Fixes https://github.com/JetBrains/compose-jb/issues/2459

Readme: https://github.com/JetBrains/compose-jb/pull/2526

1. Add `dependencies: Dependencies` extension that is accessible in `compose { }` block
2. Add `Dependencies.compiler` property that can return versions of Compose compiler used by the plugin:
```
compose {
    kotlinCompilerPlugin.set(dependencies.compiler.forKotlin("1.7.20"))
    //kotlinCompilerPlugin.set(dependencies.compiler.auto) // determined by applied version of Kotlin. It is a default.
}
```

3. Add ability to set arguments for Compose Compiler. Now we can write:
```
compose {
    kotlinCompilerPlugin.set(dependencies.compiler.forKotlin("1.7.20"))
    kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=1.7.21")
}
```

4. Remove checks for different targets

We had a separate check for JS, when we released 1.2.0. It doesn't support Kotlin 1.7.20 at that moment.

It is hard to refactor this feature in the new code, so I removed it. It is not needed now and it had an ugly code. When we will need it again, we'll write it again.

5. Remove the `compose.tests.androidx.compiler.version` property from gradle.properties and remove `defaultAndroidxCompilerEnvironment`

Because they are used only in one test, and it seems there is no reason to use it in another place in the future

* Discussions

* Update ComposeCompilerCompatability.kt (#2557)

* Update CHANGELOG.md

* 1.2.2-rc01

* Update Compose

* Update CHANGELOG.md

* Compose 1.2.2

* Remove shared.podspec

* Remove usages of deprecated Intellij APIs

Co-authored-by: Alexey Tsvetkov <alexey.tsvetkov@jetbrains.com>
Co-authored-by: Alexey Tsvetkov <654232+AlexeyTsvetkov@users.noreply.github.com>
pull/2572/head
Igor Demin 2 years ago committed by GitHub
parent
commit
be0c1c87e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 31
      CHANGELOG.md
  2. 2
      ci/compose-uber-jar/gradle.properties
  3. 2
      examples/codeviewer/gradle.properties
  4. 2
      examples/falling-balls/gradle.properties
  5. 2
      examples/imageviewer/gradle.properties
  6. 2
      examples/intellij-plugin/gradle.properties
  7. 2
      examples/issues/gradle.properties
  8. 2
      examples/notepad/gradle.properties
  9. 2
      examples/todoapp-lite/gradle.properties
  10. 2
      examples/todoapp/gradle.properties
  11. 2
      examples/visual-effects/gradle.properties
  12. 2
      examples/web-compose-bird/gradle.properties
  13. 2
      examples/web-compose-in-js/gradle.properties
  14. 2
      examples/web-landing/gradle.properties
  15. 2
      examples/web-with-react/gradle.properties
  16. 2
      examples/widgets-gallery/gradle.properties
  17. 2
      gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerCompatability.kt
  18. 2
      gradle-plugins/gradle.properties
  19. 2
      templates/desktop-template/gradle.properties
  20. 2
      templates/multiplatform-template/gradle.properties
  21. 2
      templates/web-template/gradle.properties
  22. 4
      tutorials/Getting_Started/README.md
  23. 2
      tutorials/Web/Getting_Started/README.md
  24. 2
      web/gradle.properties

31
CHANGELOG.md

@ -1,3 +1,26 @@
# 1.2.2 (December 2022)
## Desktop
## Features
- [Improve DSL for setting a custom Compose Plugin](https://github.com/JetBrains/compose-jb/pull/2527)
- [Add default ProGuard rules for Kotlin](https://github.com/JetBrains/compose-jb/commit/e6b2f0b8d0dab37529717942859ddc019ceaeecb)
### Fixes
- Fix [Performance degradation after some time if there are animations on the screen](https://github.com/JetBrains/compose-jb/issues/2455)
- Fix [SwingPanel throws NPE on focus request if nothing focusable](https://github.com/JetBrains/compose-jb/issues/2512)
- Fix [jvmTarget value specified using jvmToolchain is ignored and overwritten with "1.8"](https://github.com/JetBrains/compose-jb/issues/2511)
- Fix [Trying to delete a word via Ctrl+Backspace in an empty TextField causes an exception](https://github.com/JetBrains/compose-jb/issues/2466)
## Dependencies
This version of Compose Multiplatform is based on the next Jetpack Compose libraries:
- [Compiler 1.3.2](https://developer.android.com/jetpack/androidx/releases/compose-compiler#1.3.2)
- [Runtime 1.2.1](https://developer.android.com/jetpack/androidx/releases/compose-runtime#1.2.1)
- [UI 1.2.1](https://developer.android.com/jetpack/androidx/releases/compose-ui#1.2.1)
- [Foundation 1.2.1](https://developer.android.com/jetpack/androidx/releases/compose-foundation#1.2.1)
- [Material 1.2.1](https://developer.android.com/jetpack/androidx/releases/compose-material#1.2.1)
- [Material3 1.0.0-alpha14](https://developer.android.com/jetpack/androidx/releases/compose-material3#1.0.0-alpha14)
# 1.2.1 (November 2022) # 1.2.1 (November 2022)
## Common ## Common
@ -17,7 +40,7 @@
### Fixes ### Fixes
- [Support Kotlin 1.7.20](https://github.com/JetBrains/compose-jb/issues/2349) - [Support Kotlin 1.7.20](https://github.com/JetBrains/compose-jb/issues/2349)
## Updated dependencies ## Dependencies
This version of Compose Multiplatform is based on the next Jetpack Compose libraries: This version of Compose Multiplatform is based on the next Jetpack Compose libraries:
- [Compiler 1.3.2](https://developer.android.com/jetpack/androidx/releases/compose-compiler#1.3.2) - [Compiler 1.3.2](https://developer.android.com/jetpack/androidx/releases/compose-compiler#1.3.2)
- [Runtime 1.2.1](https://developer.android.com/jetpack/androidx/releases/compose-runtime#1.2.1) - [Runtime 1.2.1](https://developer.android.com/jetpack/androidx/releases/compose-runtime#1.2.1)
@ -98,7 +121,7 @@ This version of Compose Multiplatform is based on the next Jetpack Compose libra
- [Remove deprecated compose.web.web-widgets from the source code](https://github.com/JetBrains/compose-jb/pull/2294) - [Remove deprecated compose.web.web-widgets from the source code](https://github.com/JetBrains/compose-jb/pull/2294)
- [Remove unnecessary parameter for `required` attribute](https://github.com/JetBrains/compose-jb/pull/1988) - [Remove unnecessary parameter for `required` attribute](https://github.com/JetBrains/compose-jb/pull/1988)
## Updated dependencies ## Dependencies
This version of Compose Multiplatform is based on the next Jetpack Compose libraries: This version of Compose Multiplatform is based on the next Jetpack Compose libraries:
- [Compiler 1.3.2](https://developer.android.com/jetpack/androidx/releases/compose-compiler#1.3.2) - [Compiler 1.3.2](https://developer.android.com/jetpack/androidx/releases/compose-compiler#1.3.2)
- [Runtime 1.2.1](https://developer.android.com/jetpack/androidx/releases/compose-runtime#1.2.1) - [Runtime 1.2.1](https://developer.android.com/jetpack/androidx/releases/compose-runtime#1.2.1)
@ -185,7 +208,7 @@ fun main() = singleWindowApplication {
``` ```
- [`PointerEvent.awtEvent`, `KeyEvent.awtEvent` are deprecated](https://github.com/JetBrains/androidx/pull/198), use `PointerEvent.awtEventOrNull`, `KeyEvent.awtEventOrNull` instead. The event can be null, if it isn't sent by AWT (for example, Compose can send synthetic Move events on relayout) - [`PointerEvent.awtEvent`, `KeyEvent.awtEvent` are deprecated](https://github.com/JetBrains/androidx/pull/198), use `PointerEvent.awtEventOrNull`, `KeyEvent.awtEventOrNull` instead. The event can be null, if it isn't sent by AWT (for example, Compose can send synthetic Move events on relayout)
## Updated dependencies ## Dependencies
This version of Compose Multiplatform is based on the next Jetpack Compose libraries: This version of Compose Multiplatform is based on the next Jetpack Compose libraries:
- [Compiler 1.1.0](https://developer.android.com/jetpack/androidx/releases/compose-compiler#1.1.0) - [Compiler 1.1.0](https://developer.android.com/jetpack/androidx/releases/compose-compiler#1.1.0)
- [Runtime 1.1.0](https://developer.android.com/jetpack/androidx/releases/compose-runtime#1.1.0) - [Runtime 1.1.0](https://developer.android.com/jetpack/androidx/releases/compose-runtime#1.1.0)
@ -220,7 +243,7 @@ This is basically 1.0.0 that works with Kotlin 1.6.10
- [Some functions were made internal (either not related to compose-web or not intended for usage in apps): buildCSS , StylePropertyList.nativeEquals , variableValue , buildCSSStyleRule , buildKeyframes , jsObject , CSSKeyframesRule.appendRule](https://github.com/JetBrains/compose-jb/pull/1509/files) - [Some functions were made internal (either not related to compose-web or not intended for usage in apps): buildCSS , StylePropertyList.nativeEquals , variableValue , buildCSSStyleRule , buildKeyframes , jsObject , CSSKeyframesRule.appendRule](https://github.com/JetBrains/compose-jb/pull/1509/files)
- CSSMediaRule: functions feature and combine were made extensions functions on GenericStyleSheetBuilder. This makes them consistent with the rest of functions which create CSSMediaQuery.MediaFeature instances - CSSMediaRule: functions feature and combine were made extensions functions on GenericStyleSheetBuilder. This makes them consistent with the rest of functions which create CSSMediaQuery.MediaFeature instances
## Updated dependencies ## Dependencies
This version of Compose Multiplatform is based on the next Jetpack Compose libraries: This version of Compose Multiplatform is based on the next Jetpack Compose libraries:
- [Compiler 1.1.0-beta02](https://developer.android.com/jetpack/androidx/releases/compose-compiler#1.1.0-beta02) - [Compiler 1.1.0-beta02](https://developer.android.com/jetpack/androidx/releases/compose-compiler#1.1.0-beta02)
- [Runtime 1.1.0-beta02](https://developer.android.com/jetpack/androidx/releases/compose-runtime#1.1.0-beta02) - [Runtime 1.1.0-beta02](https://developer.android.com/jetpack/androidx/releases/compose-runtime#1.1.0-beta02)

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

@ -1,2 +1,2 @@
compose.version=1.2.1 compose.version=1.2.2
kotlin.code.style=official kotlin.code.style=official

2
examples/codeviewer/gradle.properties

@ -21,4 +21,4 @@ android.enableJetifier=true
kotlin.code.style=official kotlin.code.style=official
kotlin.version=1.7.20 kotlin.version=1.7.20
agp.version=7.1.3 agp.version=7.1.3
compose.version=1.2.1 compose.version=1.2.2

2
examples/falling-balls/gradle.properties

@ -1,3 +1,3 @@
kotlin.code.style=official kotlin.code.style=official
kotlin.version=1.7.20 kotlin.version=1.7.20
compose.version=1.2.1 compose.version=1.2.2

2
examples/imageviewer/gradle.properties

@ -21,4 +21,4 @@ android.enableJetifier=true
kotlin.code.style=official kotlin.code.style=official
kotlin.version=1.7.20 kotlin.version=1.7.20
agp.version=7.1.3 agp.version=7.1.3
compose.version=1.2.1 compose.version=1.2.2

2
examples/intellij-plugin/gradle.properties

@ -1,3 +1,3 @@
kotlin.code.style=official kotlin.code.style=official
kotlin.version=1.7.20 kotlin.version=1.7.20
compose.version=1.2.1 compose.version=1.2.2

2
examples/issues/gradle.properties

@ -21,4 +21,4 @@ android.useAndroidX=true
android.enableJetifier=true android.enableJetifier=true
kotlin.version=1.7.20 kotlin.version=1.7.20
agp.version=7.1.3 agp.version=7.1.3
compose.version=1.2.1 compose.version=1.2.2

2
examples/notepad/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.7.20 kotlin.version=1.7.20
compose.version=1.2.1 compose.version=1.2.2

2
examples/todoapp-lite/gradle.properties

@ -21,4 +21,4 @@ android.enableJetifier=true
kotlin.code.style=official kotlin.code.style=official
kotlin.version=1.7.20 kotlin.version=1.7.20
agp.version=7.1.3 agp.version=7.1.3
compose.version=1.2.1 compose.version=1.2.2

2
examples/todoapp/gradle.properties

@ -28,4 +28,4 @@ kotlin.native.disableCompilerDaemon=true
# in Android module (search "Workaround for https://github.com/JetBrains/compose-jb/issues/2340") # in Android module (search "Workaround for https://github.com/JetBrains/compose-jb/issues/2340")
#TODO also change version in buildSrc/gradle.properties #TODO also change version in buildSrc/gradle.properties
kotlin.version=1.7.20 kotlin.version=1.7.20
compose.version=1.2.1 compose.version=1.2.2

2
examples/visual-effects/gradle.properties

@ -1,3 +1,3 @@
kotlin.code.style=official kotlin.code.style=official
kotlin.version=1.7.20 kotlin.version=1.7.20
compose.version=1.2.1 compose.version=1.2.2

2
examples/web-compose-bird/gradle.properties

@ -1,3 +1,3 @@
kotlin.code.style=official kotlin.code.style=official
kotlin.version=1.7.20 kotlin.version=1.7.20
compose.version=1.2.1 compose.version=1.2.2

2
examples/web-compose-in-js/gradle.properties

@ -3,4 +3,4 @@ kotlin.mpp.enableGranularSourceSetsMetadata=true
kotlin.native.enableDependencyPropagation=false kotlin.native.enableDependencyPropagation=false
kotlin.js.webpack.major.version=4 kotlin.js.webpack.major.version=4
kotlin.version=1.7.20 kotlin.version=1.7.20
compose.version=1.2.1 compose.version=1.2.2

2
examples/web-landing/gradle.properties

@ -1,3 +1,3 @@
kotlin.code.style=official kotlin.code.style=official
kotlin.version=1.7.20 kotlin.version=1.7.20
compose.version=1.2.1 compose.version=1.2.2

2
examples/web-with-react/gradle.properties

@ -1,3 +1,3 @@
kotlin.code.style=official kotlin.code.style=official
kotlin.version=1.7.20 kotlin.version=1.7.20
compose.version=1.2.1 compose.version=1.2.2

2
examples/widgets-gallery/gradle.properties

@ -20,5 +20,5 @@ android.enableJetifier=true
# Kotlin code style for this project: "official" or "obsolete": # Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official kotlin.code.style=official
kotlin.version=1.7.20 kotlin.version=1.7.20
compose.version=1.2.1 compose.version=1.2.2
agp.version=7.1.3 agp.version=7.1.3

2
gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerCompatability.kt

@ -6,7 +6,7 @@ private const val KOTLIN_COMPATABILITY_LINK =
internal object ComposeCompilerCompatability { internal object ComposeCompilerCompatability {
private val kotlinToCompiler = sortedMapOf( private val kotlinToCompiler = sortedMapOf(
"1.7.10" to "1.3.0", "1.7.10" to "1.3.0",
"1.7.20" to "1.3.2.2-beta01", "1.7.20" to "1.3.2.2",
) )
fun compilerVersionFor(kotlinVersion: String): String { fun compilerVersionFor(kotlinVersion: String): String {

2
gradle-plugins/gradle.properties

@ -2,7 +2,7 @@ org.gradle.parallel=true
kotlin.code.style=official kotlin.code.style=official
# Default version of Compose Libraries used by Gradle plugin # Default version of Compose Libraries used by Gradle plugin
compose.version=1.2.1 compose.version=1.2.2
# The latest version of Compose Compiler used by Gradle plugin. Used only in tests/CI. # The latest version of Compose Compiler used by Gradle plugin. Used only in tests/CI.
compose.tests.compiler.version=1.3.2.1 compose.tests.compiler.version=1.3.2.1
# The latest version of Kotlin compatible with compose.tests.compiler.version. Used only in tests/CI. # The latest version of Kotlin compatible with compose.tests.compiler.version. Used only in tests/CI.

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.7.20 kotlin.version=1.7.20
compose.version=1.2.1 compose.version=1.2.2

2
templates/multiplatform-template/gradle.properties

@ -4,4 +4,4 @@ android.enableJetifier=true
kotlin.code.style=official kotlin.code.style=official
kotlin.version=1.7.20 kotlin.version=1.7.20
agp.version=7.1.3 agp.version=7.1.3
compose.version=1.2.1 compose.version=1.2.2

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.7.20 kotlin.version=1.7.20
compose.version=1.2.1 compose.version=1.2.2

4
tutorials/Getting_Started/README.md

@ -43,7 +43,7 @@ For the latest versions, see the [latest versions](https://github.com/JetBrains/
``` ```
plugins { plugins {
kotlin("jvm") version "1.7.20" kotlin("jvm") version "1.7.20"
id("org.jetbrains.compose") version "1.2.1" id("org.jetbrains.compose") version "1.2.2"
} }
``` ```
@ -77,7 +77,7 @@ Then create `build.gradle.kts` with the following content:
``` kotlin ``` kotlin
plugins { plugins {
kotlin("jvm") version "1.7.20" kotlin("jvm") version "1.7.20"
id("org.jetbrains.compose") version "1.2.1" id("org.jetbrains.compose") version "1.2.2"
} }
repositories { repositories {

2
tutorials/Web/Getting_Started/README.md

@ -41,7 +41,7 @@ pluginManagement {
// Add compose gradle plugin // Add compose gradle plugin
plugins { plugins {
kotlin("multiplatform") version "1.7.20" kotlin("multiplatform") version "1.7.20"
id("org.jetbrains.compose") version "1.2.1" id("org.jetbrains.compose") version "1.2.2"
} }
// Add maven repositories // Add maven repositories

2
web/gradle.properties

@ -1,4 +1,4 @@
compose.version=1.2.1 compose.version=1.2.2
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