Commit Graph

115 Commits

Author SHA1 Message Date
Igor Demin
50c3a47acd Fix todo example (#2983)
* Fix todo example

* Remove comment

---------

Co-authored-by: Alexander Maryanovsky <msasha@gmail.com>
2023-04-05 19:09:22 +02: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
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
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
Igor Demin
4ee708c598 Upgrade examples to Compose 1.2.0 2022-10-11 21:20:53 +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
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
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
dima.avdeev
d2b9faa72e examples README and .run configurations (#2355) 2022-10-04 15:32:53 +03: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
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
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
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
Arkadii Ivanov
265de0fc28 TodoApp. Updated Decompose to 0.5.1 and MVIKotlin to 3.0.0-beta01. (#1896) 2022-02-25 16:48:45 +03:00
Ryan Simon
a749ade5d7 Fix issue where Android app is not launchable (#1758)
Launcher `Activity` should have `android:exported` attributes set to `true` so that app launchers have permission to launch the `Activity`.

Check official docs for more information: https://developer.android.com/guide/topics/manifest/activity-element#exported
2022-01-27 11:16:30 +03:00
Alexey Tsvetkov
d23806a3f4 Update examples (#1740)
* Update examples to Gradle 7.3.3

Resolves #1654

* Update compose and agp in examples

Resolves #1117

* Fix gradle plugins classloading in examples and templates

* Make falling balls mpp compatible with examples checker
2022-01-24 13:16:39 +03:00
Igor Demin
b2213e3132 Fix Todo example Deps (#1607)
task `gradlew jsBrowserDevelopmentRun` didn't work
2021-12-16 01:11:10 +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
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
3e34d5e756 Fix Todo example for Android 2021-12-01 17:10:01 +03:00
Igor Demin
3ed28dde02 Fix Todo example for Android 2021-12-01 17:08:24 +03:00
Oleksandr Karpovich
17194020d9 web: update web examples to 1.0.0-rc12 (#1517)
* web: move web-landing to 1.0.0-rc12

* web: move falling-balls-web to 1.0.0-rc12

* web: move web-compose-bird to 1.0.0-rc12

* web: move web-with-react example to 1.0.0-rc12

* web: update todoapp to 1.0.0-rc12

* web: use 1.0.0-rc12 in examples

Co-authored-by: Oleksandr Karpovich <oleksandr.karpovich@jetbrains.com>
2021-12-01 14:36:02 +01:00
Nikolay Igotti
2300750f32 Move todoapp to 10.0.0-rc12 2021-12-01 16:18:41 +03:00
Nikolay Igotti
01530c022c Move examples to 1.0.0-beta5 2021-10-29 01:10:27 +03:00
Arkadii Ivanov
bcbe9296a6 Migrated TodoApp sample iOS app to embedAndSignAppleFrameworkForXcode (#1187) 2021-09-29 16:03:08 +03:00
Oleksandr Karpovich
3eda879730 update web examples to workaround a bug when using jsRun (#1166)
see https://youtrack.jetbrains.com/issue/KT-48273

Co-authored-by: Oleksandr Karpovich <oleksandr.karpovich@jetbrains.com>
2021-09-15 17:31:52 +02:00
Shagen Ogandzhanian
27fda5b777 Force webpack@4.0.0 for web examples
This is a temporary fix for https://github.com/JetBrains/compose-jb/issues/1100
2021-09-10 11:55:38 +02:00
fauxvillage
da19a19e9a corrrect package name in nativeDistributions (#1042)
* corrrect package name in nativeDistributions

* Update build.gradle.kts

Co-authored-by: akurasov <86794754+akurasov@users.noreply.github.com>
2021-08-12 13:35:45 +03:00
Arkadii Ivanov
1564fb5791 Move TodoApp previews to compose-ui module (#1002) 2021-08-10 11:14:14 +03:00
Arkadii Ivanov
696d20c931 Update TodoApp dependencies (#1001) 2021-08-09 12:23:46 +03:00
Nikolay Igotti
d499b350a2 Move to 1.0.0-alpha1 2021-08-04 09:41:56 +03:00
Nikolay Igotti
242ec6bbf9 Cleanup samples and adjust for rc5 2021-08-03 23:04:15 +03:00
Nikolay Igotti
05488353ca MOved todoapp to 1.0.0-alpha1-rc3 2021-08-03 10:33:10 +03:00
Nikolay Igotti
0ff88e0d2c Move todoapp to 1.0.0-alpha1-rc1. 2021-08-01 19:17:07 +03:00
Oleksandr Karpovich
b41344ef41 Web/update tutorials and examples (#942)
* web: Update tutorials (to use 0.5.0-build270)

* web: Update examples (to use 0.5.0-build270 and kotlin 1.5.21)

Co-authored-by: Oleksandr Karpovich <oleksandr.karpovich@jetbrains.com>
2021-07-28 17:50:20 +02:00
Arkadii Ivanov
d89671218a Add previews to TodoApp example (#909) 2021-07-20 10:41:59 +03:00