Commit Graph

81 Commits

Author SHA1 Message Date
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
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
Igor Demin
63846c63c0 Compose 1.2.1 (#2453) 2022-11-07 14:46:37 +01:00
Igor Demin
4ee708c598 Upgrade examples to Compose 1.2.0 2022-10-11 21:20:53 +02:00
Igor Demin
37e33fba29 Compose 1.2.0-rc02 2022-10-11 17:49:48 +02:00
Igor Demin
7ad4492f43 Migrate to 1.2.0-rc01 (#2382) 2022-10-10 16:40:04 +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
Nikolay Igotti
4af260d36a Move to 1.1.0 (#1882)
Co-authored-by: Roman Sedaikin <roman.sedaikin@jetbrains.com>
Co-authored-by: Igor Demin <igordmn@gmail.com>
2022-02-25 20:48:49 +03:00
Stefan Wärting
c60b6f9669 Rename ci/docker/linux/README.MD -> ci/docker/linux/README.md (#1659) 2022-01-10 11:04:51 +03:00
Oleksandr Karpovich
e902beeece release 1.0.1-rc2 with 1.6.10 (#1590)
* move to kotlin 1.6.10-RC and corresponding compose commit

* Update path to the karma plugin we are patching

* Add ExperimentalComposeWebStyleApi

what worries me that this actually shows that there are some cases where without any changes apart version compiler people will have to worry about such annotations

* update kotlin version in templates to adopt 1.6.10-RC

* web: move ComposableWithNullableTypeParameter.kt to passing test cases

* update kotlin version in other places

* update imageviewer example: add OptIn for experimental API

* move compose

* move to kotlin 1.6.10 and corresponding compose

* move to kotlin 1.6.10 and corresponding compose

* move to 1.0.1-rc2

* move to 1.0.1-rc2 (todoapp)

Co-authored-by: Oleksandr Karpovich <oleksandr.karpovich@jetbrains.com>
Co-authored-by: Shagen Ogandzhanian <shagen.ogandzhanian@jetbrains.com>
2021-12-14 15:19:20 +01:00
Shagen Ogandzhanian
7cd130ba11 Remove "fat" Dockerfile - it was used for building compose-web but it does not anymore 2021-12-09 17:08:11 +01:00
Igor Demin
dbd0a21949 Modify replace.sh for replacing Compose version (#1511)
Remove:
```
__LATEST_COMPOSE_RELEASE_VERSION__
__KOTLIN_COMPOSE_VERSION__
System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION")
```

They pollute templates/examples.

Now, all paths where we need to change the version are hardcoded in the script.

Usage:
```
./replace.sh 1.0.0-rc6
```

This script is planned to run on CI

In the future I will add support for changing Kotlin version
2021-12-08 10:32:18 +03:00
Igor Demin
559e9364f1 Move examples to 1.0.0 (#1524) 2021-12-01 20:23:48 +03:00
Igor Demin
21473b13f1 Move to 1.0.0-rc12 (#1518)
* Move build_from_cli

* Migrate to 1.0.0-rc12

* Comment about LWJGL

* Update Tutorials
2021-12-01 15:37:02 +03:00
Igor Demin
e16673e842 Update Dockerfile 2021-09-06 13:28:29 +03:00
Shagen Ogandzhanian
e5fed5aa7b Revert 239d5d5970 till further investigation
This reverts commit 239d5d5970.
2021-08-27 15:17:19 +02:00
Shagen Ogandzhanian
239d5d5970 [web] [ci] Install specific Firefox version and make it possible to customize it in build 2021-08-27 13:26:30 +02:00
Shagen Ogandzhanian
166b314919 [web] [ci] always install latest firefox 2021-08-26 23:57:01 +02:00
Shagen Ogandzhanian
c0735db613 [web] [ci] Don't install gradle in Dockerfile-Basic 2021-08-26 23:40:18 +02:00
Nikolay Igotti
d499b350a2 Move to 1.0.0-alpha1 2021-08-04 09:41:56 +03:00
Igor Demin
1786de28a7 Sync/2021 07 30 (#961) 2021-07-31 00:38:25 +03:00
Igor Demin
581b5f0b0a Update Compose + Migrate to 0.5.0-build262 / Kotlin 1.5.21 (#916) 2021-07-21 11:24:17 +03:00
Shagen Ogandzhanian
defae6241c Install web drivers to the gradle root 2021-06-29 14:40:12 +02:00
Shagen Ogandzhanian
9b1526e11b Install gecko driver to the compose-web light Docker image 2021-06-24 01:11:21 +02:00
Nikolay Igotti
0dc9bf0104 Move to 0.4.0 2021-05-31 18:25:21 +03:00
Nikolay Igotti
e817408595 Use 0.4.0-rc2 in examples (#720) 2021-05-31 14:19:54 +03:00
Nikolay Igotti
bf4f7051a2 Move to Kotlin 1.5.10 and Compose 0.4.0-rc1 2021-05-28 14:28:15 +03:00
Shagen Ogandzhanian
6dd94e8edb Update gradle to 7.0.2 in "fat" Docker environment for compose-web 2021-05-21 12:31:16 +02:00
Shagen Ogandzhanian
71fdf598ad Update gradle to 7.0.2 in "light" Docker environment for compose-web 2021-05-21 12:07:13 +02:00
Nikolay Igotti
38f4cfa33e Move to 0.4.0-build209 2021-05-20 19:04:27 +03:00
Nikolay Igotti
7bdb87f20b Move to Compose 0.4.0-build208 and Kotlin 1.5.0 2021-05-20 17:48:04 +03:00
Shagen Ogandzhanian
ae5d967c1e Don't pass eny global gradle config to the "light" compose-web environment 2021-05-18 17:19:33 +02:00
Shagen Ogandzhanian
a4e2d222b7 There's no need in complicated logic since we can not (easily) change entry point after all 2021-05-14 10:41:12 +02:00
Shagen Ogandzhanian
c95fbcb3dd Invoking actual bootstrap logic 2021-05-13 11:36:19 +02:00
Shagen Ogandzhanian
ed495ea09e Bootrstrapping androix repositoy in lite Dockerfile done right 2021-05-13 11:34:32 +02:00
Shagen Ogandzhanian
0eff77256a Absolute path for the bootstrap task 2021-05-12 22:12:51 +02:00
Shagen Ogandzhanian
d33e0d99b6 Introduce bootstrap process as a gradle task (compose-web basic Docker image) 2021-05-12 22:02:35 +02:00
Shagen Ogandzhanian
83352b3499 Introduce separate Docker image for build without androidx setup
The idea is to setup android in runtime after all
2021-05-12 20:48:07 +02:00
Shagen Ogandzhanian
e08d014a79 Introduce GRADLE_HOME env variable to the compose-web Dockerfile 2021-05-12 11:15:07 +02:00
Shagen Ogandzhanian
7f714b7d7f Correcting logic for global gradle in compose-web Dockerimage 2021-05-12 11:15:07 +02:00
Shagen Ogandzhanian
79ff26764b Install chrome driver to the Docker compose-web image 2021-05-11 22:05:28 +02:00
Shagen Ogandzhanian
d5abe47da6 Introduce a separate global gradle distrib in compose-web Docker image 2021-04-25 01:25:42 +02:00
Alexey Tsvetkov
56cf4c6bf9 Minor: remove force shutdown after package deletion 2021-04-23 11:22:11 +03:00
Alexey Tsvetkov
59677b5932 Fix typo 2021-04-23 11:20:00 +03:00
Alexey Tsvetkov
d496ca9ff5 Add script for deleting packages from Space 2021-04-23 10:59:18 +03:00
Shagen Ogandzhanian
8dd40e60e3 Explicitely name internal repository we are publishing to 2021-04-21 12:25:00 +02:00
Alexey Tsvetkov
8c8b4147ab Update to 0.4.0-build182 and get rid of jcenter
The build `0.4.0-build182` upgrades
`kotlinx-collections-immutable` library
(which is used by the compose runtime) to 0.3.4,
which was published to maven central,
so most usages of sunsetting jcenter repo
can be removed now.

Resolves #557
2021-04-21 12:44:57 +03:00
Shagen Ogandzhanian
8040ca67e1 Configure publication only if project has maven publishing plugin 2021-04-19 21:08:09 +02:00
Shagen Ogandzhanian
556ac1d8e0 Keep publication config in global gradle settings for compose-web Docker image 2021-04-19 17:40:33 +02:00