Commit Graph

374 Commits

Author SHA1 Message Date
Ivan Matkov
48288ea145 Fix selection in codeviewer example (#2898)
* Fix selection in codeviewer example

* Limit line count on view layer

* Fix last line ending

* Fix missing last empty line in file

* Refactor reading file

* Add extra endPosition condition

* Polish removing line endings
2023-03-24 10:14:46 +01:00
Oleksandr Karpovich
0b429b6ac9 Update all versions for 1.3.1 + update Changelog (#2856)
* Add changes for 1.3.1 + update Changelog

Versions:
compose 1.3.1
kotlin 1.8.10
compiler: 1.4.2

* revert version update in experimental examples

* Update CHANGELOG.md
2023-03-10 09:53:41 +01:00
Alexander Maryanovsky
e30379eb79 Disable validation of todoapp-lite until update to Compose 1.4.0 (#2842) 2023-03-07 20:49:18 +02:00
Alexey Tsvetkov
75addb9224 Add proguard rules for issues example (#2703) 2023-02-06 16:26:10 +01:00
Oleksandr Karpovich
bc6d42ef44 Update versions: compose - 1.3.0 and kotlin - 1.8.0 (#2651)
* Update versions in examples

* Add more scripts to validate example on android and k/js

* Add validateExamplesIos.sh

* Update CHANGELOG.md for 1.3.0

* check examples with 1.3.0-rc06

* Update the versions: compose-multiplatform - 1.3.0, kotlin - 1.8.0

* Update ComposeCompilerCompatibility (1.4.0)

* Update web/yarn.lock
2023-01-30 21:02:23 +01:00
aSemy
8f3beed1fa #2597 use textContent instead of innerText for code snippet content (#2598) 2023-01-30 20:05:56 +01:00
Igor Demin
be0c1c87e1 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>
2022-12-15 01:14:26 +01:00
Nikita Lipsky
4987cbdc89 Move CodeViewer to KMM structure + add iOS target (#2544) 2022-12-08 16:20:33 +02:00
dima.avdeev
7fce8df5f7 fix examples with Kotlin Native issue (#2534)
Needs mavenCetral at root build.gradle.kts
2022-12-05 12:51:11 +03:00
Oleksandr Karpovich
064dd2d062 fix a link in web-landing example 2022-11-07 15:47:56 +01:00
Igor Demin
63846c63c0 Compose 1.2.1 (#2453) 2022-11-07 14:46:37 +01:00
Oleksandr Karpovich
04c49a729a Update the links in compose-web landing page (#2451)
Co-authored-by: Oleksandr Karpovich <oleksandr.karpovich@jetbrains.com>
2022-11-07 12:35:54 +01:00
Arkadii Ivanov
d457a520d7 TodoApp. Updated Kotlin to 1.7.10, Compose to 1.2.0, and other libs. (#2191) 2022-10-13 20:26:58 +02:00
Oleksandr Karpovich
5936fd8063 Update compose-web examples and readme about effects (#2395)
Co-authored-by: Oleksandr Karpovich <oleksandr.karpovich@jetbrains.com>
2022-10-12 11:01:32 +02:00
Igor Demin
4ee708c598 Upgrade examples to Compose 1.2.0 2022-10-11 21:20:53 +02:00
Igor Demin
188abdfabd Refactor visual-effects and notepad 2022-10-11 19:54:25 +02:00
dima.avdeev
dcff5b2c83 todoapp android compileSdk = 32 2022-10-11 21:49:27 +04:00
dima.avdeev
09ee6b8bc7 todoapp and experimental to 1.2.0-rc02 2022-10-11 21:36:06 +04:00
Igor Demin
308a1f170d Fix Todo example (#2391)
* Fix Todo example

In 1.1.1 we remove Dispatcher.Main from dependencies, because Compose can be embedded into different platform with their own Dispatcher.Main (IDEA, for example).

Because of that, end applications should include it explicitly if they want to use it.

* Refactor
2022-10-11 19:31:19 +02:00
Igor Demin
eae694ad3d Replace package by packageDistributionForCurrentOS (#2390)
`package` is deprecated
2022-10-11 18:59:20 +02:00
Igor Demin
37e33fba29 Compose 1.2.0-rc02 2022-10-11 17:49:48 +02:00
dima.avdeev
a1a3cdc15d totoapp compose 1.2.0-rc01 (#2387)
* compose 1.2.0-rc01
* apply eymar patch to fix js
2022-10-11 16:39:01 +03:00
Igor Demin
7ad4492f43 Migrate to 1.2.0-rc01 (#2382) 2022-10-10 16:40:04 +02:00
Igor Demin
3053e17f80 Merge remote-tracking branch 'origin/master' into release/1.2
# Conflicts:
#	examples/web-landing/README.md
2022-10-10 14:50:45 +02:00
Oleksandr Karpovich
d1b1c14f19 Add links to web examples on main README.md (#2379)
* Add links to web examples on main README.md

* Update README.MD

Co-authored-by: Oleksandr Karpovich <oleksandr.karpovich@jetbrains.com>
2022-10-10 11:06:09 +02:00
Igor Demin
d18432cff9 Merge remote-tracking branch 'origin/master' into release/1.2 2022-10-08 21:57:18 +02:00
Igor Demin
a9b92891e3 Add executable permission to validateExamplesWithJs.sh 2022-10-08 21:56:30 +02:00
Igor Demin
eb34feec87 Merge remote-tracking branch 'origin/master' into release/1.2 2022-10-08 18:08:47 +02:00
Igor Demin
bafb31766e Use packageDistributionForCurrentOS in validateExamples.sh 2022-10-08 18:08:35 +02:00
Igor Demin
86bb7453d1 Merge remote-tracking branch 'origin/master' into release/1.2
# Conflicts:
#	compose/frameworks/support
#	web/gradle.properties
2022-10-08 15:57:27 +02:00
Igor Demin
3996233b03 Allow to use Compose on multiple Kotlin versions (#2366)
JS target supports a lower version (1.7.10), because we have a bug in Koltin 1.7.20

Compose 1.2.0 will support:

1.7.20 and 1.7.10 for Android and Desktop
1.7.10 for JS
We will release the new patchset (1.2.1) with 1.7.2X support for JS later
2022-10-08 15:50:51 +02:00
Igor Demin
69cf0f4c14 Remove import org.jetbrains.compose.compose (#2363)
It is no longer needed, it adds implicitly
2022-10-05 19:08:24 +02:00
Igor Demin
76a77d288e Fix IDE examples (#2361)
- move intellij-plugin-with-experimental-shared-base into experimental examples (it still on Compose 1.0.0)
- remove usage of deprecated DesktopTheme
- add `[examples](experimental/examples)` to the main page
2022-10-05 16:07:36 +03:00
Igor Demin
7bd0b3d1a5 Fix examples, templates (#2359)
- move screenshot into screenshots folder
- add Readme, run configuration, .gitignore to web-template
- fix web-compose-in-js (read versions from properties)
- add global idea/ into gitignore
2022-10-05 13:44:37 +02:00
Igor Demin
a4fd8f7e25 Support Kotlin 1.7.20 (#2357)
* Examples. Visual-effects. Add missing .gitignore

* Support Kotlin 1.7.20
2022-10-05 00:38:06 +02:00
dima.avdeev
d2b9faa72e examples README and .run configurations (#2355) 2022-10-04 15:32:53 +03:00
Igor Demin
bd494bd311 Fix Web examples 2022-10-04 02:51:59 +02:00
Igor Demin
ae1f72d7d5 Update Android Examples 2022-10-04 01:52:20 +02:00
dima.avdeev
49e1065bb1 update gradle wrapper 7.5.1 (#2352) 2022-10-03 22:04:02 +03:00
Igor Demin
5d67a73f80 Update Kotlin version 2022-10-03 01:56:58 +02:00
Igor Demin
9fa322a3ee Upgrade to 1.2.0-beta02 2022-10-03 01:51:23 +02:00
Igor Demin
a208ecba73 Upgrade to 1.2.0-beta01 2022-09-30 19:26:10 +02:00
Alexey Tsvetkov
d9de125127 Introduce ProGuard integration for Compose/Desktop packaging (#2313)
Resolves #1174
2022-09-14 18:23:40 +03:00
walfud
0ef3381362 Fix compile error: "cli.isMultipleCompiler is not a function" (#2159) 2022-09-07 14:51:30 +02:00
Alexey Tsvetkov
af92759a81 Update Intellij Gradle plugin (#2088)
Resolves #2070
2022-05-31 15:23:10 +03:00
Igor Demin
15f8b0bbd3 Revert Kotlin to 1.6.10
Version of Kotlin should be compatible with Compose that is set in gradle.properties
2022-04-29 16:33:55 +04:00
dima-avdeev-jb
3585dd3afa Fix todoapp sample, iOS build (#2024) 2022-04-21 12:54:45 +04:00
Oleksandr Karpovich
95c5783bd8 pass -Pkotlin.version=$KOTLIN_VERSION in validateExamples.sh
It was ignored previously.
2022-04-21 10:25:02 +02:00
Oleksandr Karpovich
e69ac23dbf 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>
2022-04-20 15:33:01 +02:00
Travis Reitter
6f00515736 Apple Silicon build fixes for todoapp (#1999)
* upgrade Reaktive to one that has better Apple Silicon support

* upgrade SQLDelight for Apple Silicon support

* Fix build to support Apple Silicon

Some of this code could be better centralized though I've been unable to
find a solution.

* simplify utils/build.gradle.kts

* workaround

* fix review comments

* sample todoapp: rename Todo.framework -> KotlinCommon.framework

Co-authored-by: dima.avdeev <dima.avdeev@jetbrains.com>
2022-04-20 10:10:55 +04:00