Commit Graph

70 Commits

Author SHA1 Message Date
7ce44173e8 Merge pull request 'fix(deps): update dependency androidx.core:core-ktx to v1.12.0' (#5) from renovate/androidx.core-core-ktx-1.x into main
Reviewed-on: #5
2023-10-29 09:45:15 +08:00
83852c33d3 fix(deps): update dependency androidx.core:core-ktx to v1.12.0 2023-10-28 16:02:48 +00:00
8973dd9793 Merge pull request 'chore(deps): update plugin org.gradle.toolchains.foojay-resolver-convention to v0.7.0' (#2) from renovate/org.gradle.toolchains.foojay-resolver-convention-0.x into main
Reviewed-on: #2
2023-10-28 23:37:39 +08:00
04572cbf9e Merge branch 'main' into renovate/org.gradle.toolchains.foojay-resolver-convention-0.x 2023-10-28 23:35:47 +08:00
6f606185ba Merge pull request 'fix(deps): update dependency androidx.activity:activity-compose to v1.8.0' (#3) from renovate/androidx.activity-activity-compose-1.x into main
Reviewed-on: #3
2023-10-28 23:35:33 +08:00
42f5d906fa fix(deps): update dependency androidx.activity:activity-compose to v1.8.0 2023-10-28 15:30:37 +00:00
22560c304e chore(deps): update plugin org.gradle.toolchains.foojay-resolver-convention to v0.7.0 2023-10-28 15:30:35 +00:00
d8ba35810b
feat: 升级gradle
Signed-off-by: 小草林(田梓萱) <xcl@xuegao-tzx.top>
2023-10-28 23:28:09 +08:00
3421b66613
feat: 升级依赖
Signed-off-by: 小草林(田梓萱) <xcl@xuegao-tzx.top>
2023-10-28 23:24:45 +08:00
2a42820449 Merge pull request 'Configure Renovate' (#1) from renovate/configure into main
Reviewed-on: #1
2023-10-28 23:20:38 +08:00
c743d01068 Add renovate.json 2023-10-28 15:18:25 +00:00
Igor Demin
8380eb51d7 Compose 1.5.3 2023-10-05 20:02:24 +02:00
dima.avdeev
4def89b44f Update Compose version 1.5.2 2023-09-26 17:33:07 +04:00
Igor Demin
d7e64afa5e
Merge pull request #23 from JetBrains/igor.demin/fix-java-toolchain
Add org.gradle.toolchains.foojay-resolver-convention
2023-09-12 22:15:53 +02:00
Igor Demin
a8496f08ee Add org.gradle.toolchains.foojay-resolver-convention
According to https://developer.android.com/build/jdks we should:

1. [use JDK 17 for API 34](https://developer.android.com/build/jdks#compileSdk)
2. [use toolchain](https://developer.android.com/build/jdks#toolchain):
```
We recommend that you always specify the Java toolchain, and either ensure that the specified JDK is installed, or add a toolchain resolver to your build.
```

As we don't want to force people to have JDK 17 on their machine, we apply toolchain resolver that is recommended by Gradle:
```
id("org.gradle.toolchains.foojay-resolver-convention") version("0.4.0")
```

## Test
1. Remove JDK 17 from the computer, remove `jvmToolchain(17)`
2. Run `./gradlew assembleDebug`
3. It should fail with:
```
> Could not create task ':androidApp:compileDebugJavaWithJavac'.
   > Failed to calculate the value of task ':androidApp:compileDebugJavaWithJavac' property 'javaCompiler'.
      > No matching toolchains found for requested specification: {languageVersion=17, vendor=any, implementation=vendor-specific} for WINDOWS on x86_64.
         > No locally installed toolchains match and toolchain download repositories have not been configured.
```
4. restore `jvmToolchain(17)`
5. Run `./gradlew assembleDebug` again
6. It should succeed

## Issues
Fixes https://github.com/JetBrains/compose-multiplatform/issues/3615
2023-09-12 21:19:31 +02:00
Oleksandr Karpovich
b3cca0be20
Merge pull request #22 from JetBrains/eymar-patch-1
Compose 1.5.1 and Kotlin 1.9.10
2023-09-07 10:23:36 +02:00
Oleksandr Karpovich
1b5b76127f
Compose 1.5.1 and Kotlin 1.9.10 2023-09-07 09:24:00 +02:00
Igor Demin
f18d896653 Merge remote-tracking branch 'origin/main' into support/1.5.0 2023-08-28 13:40:44 +02:00
dima.avdeev
d9921dceae
Update SwiftUI 2023-08-28 13:25:07 +03:00
dima.avdeev
6a8fafa9a6
iOSApp, remove preferredColorScheme in SwiftUI 2023-08-28 13:23:52 +03:00
Igor Demin
69f909a553 Compose 1.5.0 2023-08-25 20:17:11 +02:00
Igor Demin
0840a6c9bd
Merge pull request #21 from JetBrains/igor.demin/update-android
Update Android project
2023-08-25 16:47:43 +02:00
Igor Demin
34847c6a3e Update Android project
- update AGP
- update targetSdk=34
- update versions
- update Gradle
- targetSdk in library projects is deprecated
2023-08-25 12:51:32 +02:00
Igor Demin
aa0314d46c
Merge pull request #19 from JetBrains/switch-to-regular-framework
Replace cocoapods with regular framework
2023-08-25 11:20:47 +02:00
Alexey Tsvetkov
2c96d18c7b Update to 1.5.0-rc01 2023-08-18 16:17:57 +02:00
Alexey Tsvetkov
e0647e6aa2 Replace cocoapods with regular framework 2023-08-16 23:02:32 +02:00
dima.avdeev
c20faa0995
Gradle, android -> androidTarget (#20) 2023-07-27 15:09:17 +03:00
Igor Demin
ba91acf5d6 Compose 1.4.3 2023-07-26 01:21:45 +02:00
Igor Demin
858e08f661 Compose 1.4.1 2023-06-26 21:21:47 +02:00
Sebastian Aigner
1ff7cb2f7b Add configChanges to AndroidManifest.xml to prevent activity recreation 2023-06-19 20:28:31 +02:00
Sebastian Aigner
c7d2402619 Add explicit place to change the status bar color
Make it so that Compose stretches to the bottom of the screen (no white border)
2023-05-23 16:57:02 +02:00
Elijah Semyonov
87dfc98d36
Allow higher than 60hz framerates on CADisplayLink on iPhones (#17) 2023-05-18 13:12:26 +03:00
dima.avdeev
29ce600cb8
fix iOS build with multiple modules (#14)
Describe problem here https://github.com/dima-avdeev-jb/kotlin-gradle-plugin-ios-root-project-name-with-space
2023-05-03 17:29:54 +03:00
katia-energizer
bbbb3a8e24
Updated after proofreading (#13)
Co-authored-by: Ekaterina.Volodko <ekaterina.volodko@jetbrains.com>
2023-04-21 12:46:36 +03:00
Sebastian Aigner
dde60620de
Merge pull request #11 from ahmad-hossain/main
Fix typo in README.md
2023-04-16 09:10:04 +02:00
ahmad-hossain
a22b3611f8
Fix typo in README.md 2023-04-16 01:14:08 -04:00
Igor Demin
ac20bb79af
Merge pull request #10 from steprescott/patch-1
Update README.md
2023-04-14 14:02:38 +02:00
Ste Prescott
44e8c2274a
Update README.md
Links in the next steps section don't navigate to their intended locations.
2023-04-13 19:03:36 +01:00
Igor Demin
5db0e60d4a
Merge pull request #6 from danil-pavlov/main
update: tutorial review
2023-04-12 16:34:29 +02:00
Igor Demin
f22ed89246 Compose Multiplatform 1.4.0 2023-04-12 13:37:13 +02:00
Danil Pavlov
860ca60bd0
Update README.md
Co-authored-by: Igor Demin <igordmn@users.noreply.github.com>
2023-04-11 17:50:16 +02:00
Danil Pavlov
8133b58561
Update README.md
Co-authored-by: Igor Demin <igordmn@users.noreply.github.com>
2023-04-11 17:50:06 +02:00
Danil Pavlov
53861b76f9 update: review suggestions 2023-04-11 13:30:21 +02:00
Danil Pavlov
1651aa19c1 update: review suggestions 2023-04-10 18:15:27 +02:00
Nikita Lipsky
8618e264e2
Merge pull request #8 from JetBrains/pjBooms/remove-internal
Remove internal from common public @Composable as it is not required for 1.4.0-rc03
2023-04-07 15:29:26 +03:00
Nikita Lipsky
0673d97a0d Remove internal from common public @Composable as it is not required for 1.4.0-rc03 2023-04-07 14:53:50 +03:00
Danil Pavlov
17978e6fdb
Merge pull request #1 from danil-pavlov/tutorial-update
update: README tutorial
2023-04-06 12:59:11 +02:00
Danil Pavlov
5295d91595 update: images 2023-04-06 12:56:18 +02:00
Danil Pavlov
410337eb74 update: tutorial review 2023-04-05 16:32:37 +02:00
Nikita Lipsky
c005b55e42
Merge pull request #5 from SebastianAigner/aigner-update-readme
Update README images and code
2023-04-03 15:40:17 +03:00