Skip to content

Commit

Permalink
Compose 1.4.1 docs, examples (#3287)
Browse files Browse the repository at this point in the history
* Compose 1.4.1

* Remove compose-integration from replaceVersion.sh
igordmn authored Jun 26, 2023
1 parent b038d0d commit bf4130c
Showing 26 changed files with 69 additions and 36 deletions.
28 changes: 28 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,31 @@
# 1.4.1 (June 2023)

## Common

### Fixes
- [Fix perspective transform usage](https://github.com/JetBrains/compose-multiplatform-core/pull/598)
- [After each ComposeScene.render phase, send apply notifications and perform the corresponding changes](https://github.com/JetBrains/compose-multiplatform-core/pull/563)
- [Fix awaitDragStartOnSlop to detect slop-passing on both axes](https://github.com/JetBrains/compose-multiplatform-core/pull/534)

## Desktop

### Fixes
- [Fix `DesktopDropdownMenuPositionProvider` to align with the correct horizontal side of the window](https://github.com/JetBrains/compose-multiplatform-core/pull/555)
- [Propagate LocalLayoutDirection into PopupLayout](https://github.com/JetBrains/compose-multiplatform-core/pull/562)
- [Fix missing scrolling events](https://github.com/JetBrains/compose-multiplatform-core/pull/527)
- [Make popups accessible on desktop](https://github.com/JetBrains/compose-multiplatform-core/pull/439)

## Dependencies

This version of Compose Multiplatform is based on the next Jetpack Compose libraries:

- [Compiler 1.4.4](https://developer.android.com/jetpack/androidx/releases/compose-compiler#1.4.4)
- [Runtime 1.4.3](https://developer.android.com/jetpack/androidx/releases/compose-runtime#1.4.3)
- [UI 1.4.3](https://developer.android.com/jetpack/androidx/releases/compose-ui#1.4.3)
- [Foundation 1.4.3](https://developer.android.com/jetpack/androidx/releases/compose-foundation#1.4.3)
- [Material 1.4.3](https://developer.android.com/jetpack/androidx/releases/compose-material#1.4.3)
- [Material3 1.0.1](https://developer.android.com/jetpack/androidx/releases/compose-material3#1.0.1)

# 1.4.0 (April 2023)

## Common
2 changes: 1 addition & 1 deletion ci/compose-uber-jar/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
compose.version=1.3.1
compose.version=1.4.1
kotlin.code.style=official
2 changes: 1 addition & 1 deletion ci/templates/desktop-template/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
kotlin.code.style=official
kotlin.version=1.8.20
compose.version=1.4.0
compose.version=1.4.1
2 changes: 1 addition & 1 deletion ci/templates/html-library-template/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
kotlin.code.style=official
kotlin.version=1.8.20
compose.version=1.4.0
compose.version=1.4.1
2 changes: 1 addition & 1 deletion ci/templates/multiplatform-template/gradle.properties
Original file line number Diff line number Diff line change
@@ -4,4 +4,4 @@ android.enableJetifier=true
kotlin.code.style=official
kotlin.version=1.8.20
agp.version=7.1.3
compose.version=1.4.0
compose.version=1.4.1
2 changes: 1 addition & 1 deletion components/gradle.properties
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ kotlin.code.style=official
# __KOTLIN_COMPOSE_VERSION__
kotlin.version=1.8.20
# __LATEST_COMPOSE_RELEASE_VERSION__
compose.version=1.4.0
compose.version=1.4.1
agp.version=7.3.1
org.jetbrains.compose.experimental.jscanvas.enabled=true
org.jetbrains.compose.experimental.macos.enabled=true
2 changes: 1 addition & 1 deletion examples/chat/gradle.properties
Original file line number Diff line number Diff line change
@@ -13,4 +13,4 @@ kotlin.mpp.androidSourceSetLayoutVersion=2
kotlin.native.binary.memoryModel=experimental
kotlin.version=1.8.20
agp.version=7.1.3
compose.version=1.4.0
compose.version=1.4.1
2 changes: 1 addition & 1 deletion examples/codeviewer/gradle.properties
Original file line number Diff line number Diff line change
@@ -13,4 +13,4 @@ kotlin.mpp.androidSourceSetLayoutVersion=2
kotlin.native.binary.memoryModel=experimental
kotlin.version=1.8.20
agp.version=7.1.3
compose.version=1.4.0
compose.version=1.4.1
2 changes: 1 addition & 1 deletion examples/falling-balls/gradle.properties
Original file line number Diff line number Diff line change
@@ -13,4 +13,4 @@ kotlin.mpp.androidSourceSetLayoutVersion=2
kotlin.native.binary.memoryModel=experimental
kotlin.version=1.8.20
agp.version=7.1.3
compose.version=1.4.0
compose.version=1.4.1
2 changes: 1 addition & 1 deletion examples/html/compose-bird/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
kotlin.code.style=official
kotlin.version=1.8.20
compose.version=1.4.0
compose.version=1.4.1
2 changes: 1 addition & 1 deletion examples/html/compose-in-js/gradle.properties
Original file line number Diff line number Diff line change
@@ -3,4 +3,4 @@ kotlin.mpp.enableGranularSourceSetsMetadata=true
kotlin.native.enableDependencyPropagation=false
kotlin.js.webpack.major.version=4
kotlin.version=1.8.20
compose.version=1.4.0
compose.version=1.4.1
2 changes: 1 addition & 1 deletion examples/html/landing/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
kotlin.code.style=official
kotlin.version=1.8.20
compose.version=1.4.0
compose.version=1.4.1
2 changes: 1 addition & 1 deletion examples/html/with-react/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
kotlin.code.style=official
kotlin.version=1.8.20
compose.version=1.4.0
compose.version=1.4.1
2 changes: 1 addition & 1 deletion examples/imageviewer/gradle.properties
Original file line number Diff line number Diff line change
@@ -13,4 +13,4 @@ kotlin.native.useEmbeddableCompilerJar=true
kotlin.native.binary.memoryModel=experimental
kotlin.version=1.8.20
agp.version=7.1.3
compose.version=1.4.0
compose.version=1.4.1
2 changes: 1 addition & 1 deletion examples/intellij-plugin/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
kotlin.code.style=official
kotlin.version=1.8.20
compose.version=1.4.0
compose.version=1.4.1
2 changes: 1 addition & 1 deletion examples/issues/gradle.properties
Original file line number Diff line number Diff line change
@@ -21,4 +21,4 @@ android.useAndroidX=true
android.enableJetifier=true
kotlin.version=1.8.20
agp.version=7.1.3
compose.version=1.4.0
compose.version=1.4.1
2 changes: 1 addition & 1 deletion examples/minesweeper/gradle.properties
Original file line number Diff line number Diff line change
@@ -13,4 +13,4 @@ kotlin.mpp.androidSourceSetLayoutVersion=2
kotlin.native.binary.memoryModel=experimental
kotlin.version=1.8.20
agp.version=7.1.3
compose.version=1.4.0
compose.version=1.4.1
2 changes: 1 addition & 1 deletion examples/notepad/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
kotlin.code.style=official
kotlin.version=1.8.20
compose.version=1.4.0
compose.version=1.4.1
2 changes: 1 addition & 1 deletion examples/todoapp-lite/gradle.properties
Original file line number Diff line number Diff line change
@@ -13,4 +13,4 @@ kotlin.mpp.androidSourceSetLayoutVersion=2
kotlin.native.binary.memoryModel=experimental
kotlin.version=1.8.20
agp.version=7.1.3
compose.version=1.4.0
compose.version=1.4.1
2 changes: 1 addition & 1 deletion examples/todoapp/gradle.properties
Original file line number Diff line number Diff line change
@@ -28,4 +28,4 @@ kotlin.native.disableCompilerDaemon=true
# in Android module (search "Workaround for https://github.com/JetBrains/compose-jb/issues/2340")
#TODO also change version in buildSrc/gradle.properties
kotlin.version=1.8.20
compose.version=1.4.0
compose.version=1.4.1
2 changes: 1 addition & 1 deletion examples/visual-effects/gradle.properties
Original file line number Diff line number Diff line change
@@ -13,4 +13,4 @@ kotlin.native.useEmbeddableCompilerJar=true
kotlin.native.binary.memoryModel=experimental
kotlin.version=1.8.20
agp.version=7.1.3
compose.version=1.4.0
compose.version=1.4.1
2 changes: 1 addition & 1 deletion examples/widgets-gallery/gradle.properties
Original file line number Diff line number Diff line change
@@ -13,4 +13,4 @@ kotlin.mpp.androidSourceSetLayoutVersion=2
kotlin.native.binary.memoryModel=experimental
kotlin.version=1.8.20
agp.version=7.1.3
compose.version=1.4.0
compose.version=1.4.1
2 changes: 1 addition & 1 deletion gradle-plugins/gradle.properties
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@ org.gradle.parallel=true
kotlin.code.style=official

# Default version of Compose Libraries used by Gradle plugin
compose.version=1.4.0
compose.version=1.4.1
# The latest version of Compose Compiler used by Gradle plugin. Used only in tests/CI.
compose.tests.compiler.version=1.4.5
# The latest version of Kotlin compatible with compose.tests.compiler.version. Used only in tests/CI.
2 changes: 1 addition & 1 deletion html/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
compose.version=1.4.0-rc03
compose.version=1.4.1
compose.web.buildSamples=false
compose.web.tests.integration.withFirefox
compose.web.tests.skip.benchmarks=false
29 changes: 17 additions & 12 deletions tools/replaceVersion.sh
Original file line number Diff line number Diff line change
@@ -6,18 +6,23 @@ ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"/..

# Add folders which should contain up-to-date versions
declare -a folders=(
"templates"
"examples"
#"experimental/examples"
"gradle-plugins"
"components"
"ci"
"web"
"tutorials"
"compose/integrations/composable-test-cases"
"compose/integrations/compose-with-ktx-serialization"
"$ROOT/examples"
"$ROOT/gradle-plugins"
"$ROOT/components"
"$ROOT/ci"
"$ROOT/html"
"$ROOT/tutorials"
)

if [ ! -z "$COMPOSE_TEMPLATES_FOLDER" ]; then
folders+=(
"$COMPOSE_TEMPLATES_FOLDER/compose-multiplatform-desktop-template"
"$COMPOSE_TEMPLATES_FOLDER/compose-multiplatform-html-library-template"
"$COMPOSE_TEMPLATES_FOLDER/compose-multiplatform-ios-android-template"
"$COMPOSE_TEMPLATES_FOLDER/compose-multiplatform-template"
)
fi

if [ -z "$1" ]; then
echo "Specify Compose version. For example: ./replace.sh 1.2.0-beta02 1.7.10"
exit 1
@@ -56,11 +61,11 @@ replaceVersionInFile() {
}

replaceVersionInFolder() {
find $ROOT/$1 -wholename $2 -not -path "**/build**" -not -path "**/.gradle**" | while read file; do replaceVersionInFile "$file"; done
find $1 -wholename $2 -not -path "**/build**" -not -path "**/.gradle**" | while read file; do replaceVersionInFile "$file"; done
}

for folder in "${folders[@]}"
do
replaceVersionInFolder $folder "**gradle.properties"
replaceVersionInFolder $folder "**README.md"
done
done
2 changes: 1 addition & 1 deletion tutorials/HTML/Getting_Started/README.md
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@ pluginManagement {
// Add compose gradle plugin
plugins {
kotlin("multiplatform") version "1.8.20"
id("org.jetbrains.compose") version "1.4.0"
id("org.jetbrains.compose") version "1.4.1"
}

// Add maven repositories

0 comments on commit bf4130c

Please sign in to comment.