Skip to content

Commit

Permalink
Merge branch 'JetBrains:master' into settings-property-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
MaximPestryakov authored Dec 10, 2024
2 parents 03f6c03 + da97ee6 commit 700dec8
Show file tree
Hide file tree
Showing 497 changed files with 3,969 additions and 8,736 deletions.
5 changes: 3 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ Optional, if omitted - won't be included in the changelog
Sections:
- Highlights
- Known issues
- Breaking changes
- Known Issues
- Breaking Changes
- Features
- Fixes
Expand All @@ -29,6 +29,7 @@ Subsections:
- iOS
- Desktop
- Web
- Android
- Resources
- Gradle Plugin
-->
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/gradle-plugin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-20.04, macos-14, windows-2022]
gradle: [7.4, 8.8]
agp: [8.1.0, 8.5.0]
gradle: [7.4, 8.10.2]
agp: [8.1.0, 8.5.0, 8.8.0-alpha08]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
Expand All @@ -33,7 +33,7 @@ jobs:
./gradlew assemble
./gradlew --continue :preview-rpc:test :compose:test ':compose:test-Gradle(${{ matrix.gradle }})-Agp(${{ matrix.agp }})'
- name: Upload Reports
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: Test-Reports
path: gradle-plugins/compose/build/reports
Expand Down
636 changes: 636 additions & 0 deletions CHANGELOG.md

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ For example, you can share UIs between iOS and Android or Windows and MacOS.

> iOS support is in Beta. It is feature complete, and migration issues should be minimal. You may still encounter bugs, performance and developer experience issues, but not as much as in the Alpha stage.
> We would appreciate your feedback on it in the public Slack channel [#compose-ios](https://kotlinlang.slack.com/archives/C0346LWVBJ4/p1678888063176359).
> If you face any issues, please report them on [GitHub](https://github.com/JetBrains/compose-multiplatform/issues).
> If you face any issues, please report them on [YouTrack](https://youtrack.jetbrains.com/newIssue?project=CMP).
Compose Multiplatform shares most of its API with Jetpack Compose, the Android UI framework developed by Google.
You can use the same APIs to build user interfaces for both Android and iOS.
Expand Down Expand Up @@ -57,7 +57,7 @@ It has desktop extensions for menus, keyboard shortcuts, window manipulation, an

> Web support is in Alpha. It may change incompatibly and require manual migration in the future.
> We would appreciate your feedback on it in the public Slack channel [#compose-web](https://kotlinlang.slack.com/archives/C01F2HV7868/p1678887590205449).
> If you face any issues, please report them on [GitHub](https://github.com/JetBrains/compose-multiplatform/issues).
> If you face any issues, please report them on [YouTrack](https://youtrack.jetbrains.com/newIssue?project=CMP).
You can experiment with sharing your mobile or desktop UIs with the web. Compose for Web is based on [Kotlin/Wasm](https://kotl.in/wasm),
the newest target for Kotlin Multiplatform projects. It allows Kotlin developers to run their code in the browser with
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/ios/README.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Collection of test compose multiplatfom applications used for evaluating performance of Compose for iOS.
### Moved to [multiplatform](https://github.com/JetBrains/compose-multiplatform/tree/master/benchmarks/multiplatform)
15 changes: 0 additions & 15 deletions benchmarks/ios/animation-from-template/.gitignore

This file was deleted.

23 changes: 0 additions & 23 deletions benchmarks/ios/animation-from-template/.run/desktopApp.run.xml

This file was deleted.

201 changes: 0 additions & 201 deletions benchmarks/ios/animation-from-template/LICENSE.txt

This file was deleted.

1 change: 0 additions & 1 deletion benchmarks/ios/animation-from-template/README.md

This file was deleted.

38 changes: 0 additions & 38 deletions benchmarks/ios/animation-from-template/androidApp/build.gradle.kts

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 700dec8

Please sign in to comment.