github
/
compose-jb
mirror of https://gitee.com/github-sync-mirror/compose-jb.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Update Android projects (#3566) 

- Update Gradle to 8.2.1 (for non-Android project as well)
- Update AGP to 8.0.2
  - add jvmToolchain for Android projects (it is required now)
  - removed targetSdk from shared modules (it is deprecated for com.android.library projects)
  - move "package" from manifset to "namespace " in Gradle (required by AGP)
- rename android to androidTarget (android is deprecated in latest Kotlin)
- update Android dependencies versions

I checked - Android/iOS/web still work. HTML/IDE projects also work after updating Gradle.

Works in the latest stable IDEA and Android Studio

updated templates:
https://github.com/JetBrains/compose-multiplatform-ios-android-template/pull/21
https://github.com/JetBrains/compose-multiplatform-template/pull/19
https://github.com/JetBrains/compose-multiplatform-desktop-template/pull/8
https://github.com/JetBrains/compose-multiplatform-html-library-template/pull/3
pull/3564/head
Igor Demin 1 year ago committed by GitHub
parent
53e3674118
commit
0215dd9551
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
63 changed files with 160 additions and 108 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      examples/chat/androidApp/build.gradle.kts
  2. 3
      examples/chat/androidApp/src/androidMain/AndroidManifest.xml
  3. 2
      examples/chat/gradle.properties
  4. 2
      examples/chat/gradle/wrapper/gradle-wrapper.properties
  5. 11
      examples/chat/shared/build.gradle.kts
  6. 2
      examples/chat/shared/src/androidMain/AndroidManifest.xml
  7. 2
      examples/cocoapods-ios-example/gradle.properties
  8. 1
      examples/cocoapods-ios-example/shared/build.gradle.kts
  9. 6
      examples/codeviewer/androidApp/build.gradle.kts
  10. 3
      examples/codeviewer/androidApp/src/androidMain/AndroidManifest.xml
  11. 2
      examples/codeviewer/gradle.properties
  12. 2
      examples/codeviewer/gradle/wrapper/gradle-wrapper.properties
  13. 11
      examples/codeviewer/shared/build.gradle.kts
  14. 2
      examples/codeviewer/shared/src/androidMain/AndroidManifest.xml
  15. 6
      examples/falling-balls/androidApp/build.gradle.kts
  16. 3
      examples/falling-balls/androidApp/src/androidMain/AndroidManifest.xml
  17. 2
      examples/falling-balls/gradle.properties
  18. 2
      examples/falling-balls/gradle/wrapper/gradle-wrapper.properties
  19. 11
      examples/falling-balls/shared/build.gradle.kts
  20. 2
      examples/falling-balls/shared/src/androidMain/AndroidManifest.xml
  21. 2
      examples/html/compose-bird/gradle/wrapper/gradle-wrapper.properties
  22. 2
      examples/html/compose-in-js/gradle/wrapper/gradle-wrapper.properties
  23. 2
      examples/html/landing/gradle/wrapper/gradle-wrapper.properties
  24. 2
      examples/html/with-react/gradle/wrapper/gradle-wrapper.properties
  25. 4
      examples/imageviewer/androidApp/build.gradle.kts
  26. 3
      examples/imageviewer/androidApp/src/androidMain/AndroidManifest.xml
  27. 2
      examples/imageviewer/gradle.properties
  28. 2
      examples/imageviewer/gradle/wrapper/gradle-wrapper.properties
  29. 17
      examples/imageviewer/shared/build.gradle.kts
  30. 3
      examples/imageviewer/shared/src/androidMain/AndroidManifest.xml
  31. 8
      examples/intellij-plugin/build.gradle.kts
  32. 2
      examples/intellij-plugin/gradle/wrapper/gradle-wrapper.properties
  33. 7
      examples/issues/android/build.gradle.kts
  34. 3
      examples/issues/android/src/main/AndroidManifest.xml
  35. 16
      examples/issues/common/build.gradle.kts
  36. 2
      examples/issues/common/src/androidMain/AndroidManifest.xml
  37. 2
      examples/issues/gradle.properties
  38. 2
      examples/issues/gradle/wrapper/gradle-wrapper.properties
  39. 6
      examples/minesweeper/androidApp/build.gradle.kts
  40. 3
      examples/minesweeper/androidApp/src/androidMain/AndroidManifest.xml
  41. 2
      examples/minesweeper/gradle.properties
  42. 2
      examples/minesweeper/gradle/wrapper/gradle-wrapper.properties
  43. 11
      examples/minesweeper/shared/build.gradle.kts
  44. 2
      examples/minesweeper/shared/src/androidMain/AndroidManifest.xml
  45. 2
      examples/notepad/gradle/wrapper/gradle-wrapper.properties
  46. 6
      examples/todoapp-lite/androidApp/build.gradle.kts
  47. 3
      examples/todoapp-lite/androidApp/src/androidMain/AndroidManifest.xml
  48. 2
      examples/todoapp-lite/gradle.properties
  49. 2
      examples/todoapp-lite/gradle/wrapper/gradle-wrapper.properties
  50. 11
      examples/todoapp-lite/shared/build.gradle.kts
  51. 2
      examples/todoapp-lite/shared/src/androidMain/AndroidManifest.xml
  52. 6
      examples/visual-effects/androidApp/build.gradle.kts
  53. 3
      examples/visual-effects/androidApp/src/androidMain/AndroidManifest.xml
  54. 2
      examples/visual-effects/gradle.properties
  55. 2
      examples/visual-effects/gradle/wrapper/gradle-wrapper.properties
  56. 11
      examples/visual-effects/shared/build.gradle.kts
  57. 2
      examples/visual-effects/shared/src/androidMain/AndroidManifest.xml
  58. 6
      examples/widgets-gallery/androidApp/build.gradle.kts
  59. 3
      examples/widgets-gallery/androidApp/src/androidMain/AndroidManifest.xml
  60. 2
      examples/widgets-gallery/gradle.properties
  61. 2
      examples/widgets-gallery/gradle/wrapper/gradle-wrapper.properties
  62. 11
      examples/widgets-gallery/shared/build.gradle.kts
  63. 2
      examples/widgets-gallery/shared/src/androidMain/AndroidManifest.xml

6
examples/chat/androidApp/build.gradle.kts
Unescape View File

@ -5,7 +5,7 @@ plugins {
}
kotlin {
android()
androidTarget()
sourceSets {
val androidMain by getting {
dependencies {
@ -17,6 +17,7 @@ kotlin {
android {
compileSdk = 34
namespace = "org.jetbrains.chat"
defaultConfig {
applicationId = "org.jetbrains.Chat"
minSdk = 26
@ -28,4 +29,7 @@ android {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
kotlin {
jvmToolchain(11)
}
}

3
examples/chat/androidApp/src/androidMain/AndroidManifest.xml
Unescape View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.jetbrains.chat">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:allowBackup="true"

2
examples/chat/gradle.properties
Unescape View File

@ -10,5 +10,5 @@ kotlin.mpp.androidSourceSetLayoutVersion=2
# Enable kotlin/native experimental memory model
kotlin.native.binary.memoryModel=experimental
kotlin.version=1.9.0
agp.version=7.1.3
agp.version=8.0.2
compose.version=1.5.0-rc04

2
examples/chat/gradle/wrapper/gradle-wrapper.properties vendored
Unescape View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

11
examples/chat/shared/build.gradle.kts
Unescape View File

@ -9,7 +9,7 @@ plugins {
version = "1.0-SNAPSHOT"
kotlin {
android()
androidTarget()
jvm("desktop")
@ -57,9 +57,9 @@ kotlin {
}
val androidMain by getting {
dependencies {
api("androidx.activity:activity-compose:1.6.1")
api("androidx.activity:activity-compose:1.7.2")
api("androidx.appcompat:appcompat:1.6.1")
api("androidx.core:core-ktx:1.9.0")
api("androidx.core:core-ktx:1.10.1")
}
}
val iosMain by creating {
@ -94,16 +94,19 @@ kotlin {
android {
compileSdk = 34
namespace = "org.jetbrains.chat"
sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
sourceSets["main"].res.srcDirs("src/androidMain/res")
sourceSets["main"].resources.srcDirs("src/commonMain/resources")
defaultConfig {
minSdk = 26
targetSdk = 34
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
kotlin {
jvmToolchain(11)
}
}

2
examples/chat/shared/src/androidMain/AndroidManifest.xml
Unescape View File

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.jetbrains.chat"/>
<manifest />

2
examples/cocoapods-ios-example/gradle.properties
Unescape View File

@ -20,5 +20,5 @@ org.jetbrains.compose.experimental.uikit.enabled=true
#Versions
kotlin.version=1.9.0
agp.version=7.4.2
agp.version=8.0.2
compose.version=1.5.0-rc04

1
examples/cocoapods-ios-example/shared/build.gradle.kts
Unescape View File

@ -56,7 +56,6 @@ android {
defaultConfig {
minSdk = (findProperty("android.minSdk") as String).toInt()
targetSdk = (findProperty("android.targetSdk") as String).toInt()
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_11

6
examples/codeviewer/androidApp/build.gradle.kts
Unescape View File

@ -5,7 +5,7 @@ plugins {
}
kotlin {
android()
androidTarget()
sourceSets {
val androidMain by getting {
dependencies {
@ -17,6 +17,7 @@ kotlin {
android {
compileSdk = 34
namespace = "org.jetbrains.codeviewer"
defaultConfig {
applicationId = "org.jetbrains.Codeviewer"
minSdk = 26
@ -28,4 +29,7 @@ android {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
kotlin {
jvmToolchain(11)
}
}

3
examples/codeviewer/androidApp/src/androidMain/AndroidManifest.xml
Unescape View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.jetbrains.codeviewer">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:allowBackup="true"

2
examples/codeviewer/gradle.properties
Unescape View File

@ -10,5 +10,5 @@ kotlin.mpp.androidSourceSetLayoutVersion=2
# Enable kotlin/native experimental memory model
kotlin.native.binary.memoryModel=experimental
kotlin.version=1.9.0
agp.version=7.1.3
agp.version=8.0.2
compose.version=1.5.0-rc04

2
examples/codeviewer/gradle/wrapper/gradle-wrapper.properties vendored
Unescape View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

11
examples/codeviewer/shared/build.gradle.kts
Unescape View File

@ -9,7 +9,7 @@ plugins {
version = "1.0-SNAPSHOT"
kotlin {
android()
androidTarget()
jvm("desktop")
@ -38,9 +38,9 @@ kotlin {
val androidMain by getting {
kotlin.srcDirs("src/jvmMain/kotlin")
dependencies {
api("androidx.activity:activity-compose:1.6.1")
api("androidx.activity:activity-compose:1.7.2")
api("androidx.appcompat:appcompat:1.6.1")
api("androidx.core:core-ktx:1.9.0")
api("androidx.core:core-ktx:1.10.1")
}
}
val iosMain by creating {
@ -66,14 +66,17 @@ kotlin {
android {
compileSdk = 34
namespace = "org.jetbrains.codeviewer.common"
sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
sourceSets["main"].res.srcDirs("src/androidMain/res", "src/commonMain/resources")
defaultConfig {
minSdk = 26
targetSdk = 34
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
kotlin {
jvmToolchain(11)
}
}

2
examples/codeviewer/shared/src/androidMain/AndroidManifest.xml
Unescape View File

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="org.jetbrains.codeviewer.common"/>
<manifest />

6
examples/falling-balls/androidApp/build.gradle.kts
Unescape View File

@ -5,7 +5,7 @@ plugins {
}
kotlin {
android()
androidTarget()
sourceSets {
val androidMain by getting {
dependencies {
@ -17,6 +17,7 @@ kotlin {
android {
compileSdk = 34
namespace = "org.jetbrains.fallingballs"
defaultConfig {
applicationId = "org.jetbrains.FallingBalls"
minSdk = 26
@ -28,4 +29,7 @@ android {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
kotlin {
jvmToolchain(11)
}
}

3
examples/falling-balls/androidApp/src/androidMain/AndroidManifest.xml
Unescape View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.jetbrains.fallingballs">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:allowBackup="true"

2
examples/falling-balls/gradle.properties
Unescape View File

@ -10,7 +10,7 @@ kotlin.mpp.androidSourceSetLayoutVersion=2
# Enable kotlin/native experimental memory model
kotlin.native.binary.memoryModel=experimental
kotlin.version=1.9.0
agp.version=7.1.3
agp.version=8.0.2
compose.version=1.5.0-rc04
# TODO: remove when switching to 1.9.10. See: https://youtrack.jetbrains.com/issue/KT-60852

2
examples/falling-balls/gradle/wrapper/gradle-wrapper.properties vendored
Unescape View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

11
examples/falling-balls/shared/build.gradle.kts
Unescape View File

@ -12,7 +12,7 @@ plugins {
version = "1.0-SNAPSHOT"
kotlin {
android()
androidTarget()
jvm("desktop")
@ -67,9 +67,9 @@ kotlin {
}
val androidMain by getting {
dependencies {
api("androidx.activity:activity-compose:1.6.1")
api("androidx.activity:activity-compose:1.7.2")
api("androidx.appcompat:appcompat:1.6.1")
api("androidx.core:core-ktx:1.9.0")
api("androidx.core:core-ktx:1.10.1")
}
}
val iosMain by creating {
@ -107,16 +107,19 @@ kotlin {
android {
compileSdk = 34
namespace = "org.jetbrains.fallingballs"
sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
sourceSets["main"].res.srcDirs("src/androidMain/res")
sourceSets["main"].resources.srcDirs("src/commonMain/resources")
defaultConfig {
minSdk = 26
targetSdk = 34
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
kotlin {
jvmToolchain(11)
}
}

2
examples/falling-balls/shared/src/androidMain/AndroidManifest.xml
Unescape View File

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.jetbrains.fallingballs"/>
<manifest />

2
examples/html/compose-bird/gradle/wrapper/gradle-wrapper.properties vendored
Unescape View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

2
examples/html/compose-in-js/gradle/wrapper/gradle-wrapper.properties vendored
Unescape View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

2
examples/html/landing/gradle/wrapper/gradle-wrapper.properties vendored
Unescape View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

2
examples/html/with-react/gradle/wrapper/gradle-wrapper.properties vendored
Unescape View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

4
examples/imageviewer/androidApp/build.gradle.kts
Unescape View File

@ -18,6 +18,7 @@ kotlin {
android {
compileSdk = 34
namespace = "example.imageviewer"
defaultConfig {
applicationId = "org.jetbrains.Imageviewer"
minSdk = 26
@ -29,6 +30,9 @@ android {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
kotlin {
jvmToolchain(11)
}
}
secrets {

3
examples/imageviewer/androidApp/src/androidMain/AndroidManifest.xml
Unescape View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="example.imageviewer">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>

2
examples/imageviewer/gradle.properties
Unescape View File

@ -10,5 +10,5 @@ kotlin.native.useEmbeddableCompilerJar=true
# Enable kotlin/native experimental memory model
kotlin.native.binary.memoryModel=experimental
kotlin.version=1.9.0
agp.version=7.1.3
agp.version=8.0.2
compose.version=1.5.0-rc04

2
examples/imageviewer/gradle/wrapper/gradle-wrapper.properties vendored
Unescape View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

17
examples/imageviewer/shared/build.gradle.kts
Unescape View File

@ -34,7 +34,7 @@ kotlin {
//implementation(compose.materialIconsExtended) // TODO not working on iOS for now
@OptIn(org.jetbrains.compose.ExperimentalComposeLibrary::class)
implementation(compose.components.resources)
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1")
implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
// Kotlin Coroutines 1.7.1 contains Dispatchers.IO for iOS
@ -43,12 +43,12 @@ kotlin {
}
val androidMain by getting {
dependencies {
api("androidx.activity:activity-compose:1.7.0")
api("androidx.activity:activity-compose:1.7.2")
api("androidx.appcompat:appcompat:1.6.1")
api("androidx.core:core-ktx:1.9.0")
implementation("androidx.camera:camera-camera2:1.2.2")
implementation("androidx.camera:camera-lifecycle:1.2.2")
implementation("androidx.camera:camera-view:1.2.2")
api("androidx.core:core-ktx:1.10.1")
implementation("androidx.camera:camera-camera2:1.2.3")
implementation("androidx.camera:camera-lifecycle:1.2.3")
implementation("androidx.camera:camera-view:1.2.3")
implementation("com.google.accompanist:accompanist-permissions:0.29.2-rc")
implementation("com.google.android.gms:play-services-maps:18.1.0")
implementation("com.google.android.gms:play-services-location:21.0.1")
@ -86,16 +86,19 @@ kotlin {
android {
compileSdk = 34
namespace = "example.imageviewer.shared"
sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
sourceSets["main"].res.srcDirs("src/androidMain/res")
sourceSets["main"].resources.srcDirs("src/commonMain/resources")
defaultConfig {
minSdk = 26
targetSdk = 34
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
kotlin {
jvmToolchain(11)
}
}

3
examples/imageviewer/shared/src/androidMain/AndroidManifest.xml
Unescape View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="example.imageviewer.shared">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />

8
examples/intellij-plugin/build.gradle.kts
Unescape View File

@ -1,5 +1,5 @@
plugins {
id("org.jetbrains.intellij") version "1.9.0"
id("org.jetbrains.intellij") version "1.15.0"
java
kotlin("jvm")
id("org.jetbrains.compose")
@ -25,6 +25,8 @@ intellij {
version.set("2021.3")
}
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
kotlinOptions.jvmTarget = "11"
kotlin {
jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(11))
}
}

2
examples/intellij-plugin/gradle/wrapper/gradle-wrapper.properties vendored
Unescape View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

7
examples/issues/android/build.gradle.kts
Unescape View File

@ -6,21 +6,24 @@ plugins {
android {
compileSdk = 34
namespace = "com.example.myapplication"
defaultConfig {
minSdk = 26
targetSdk = 34
applicationId = "org.jetbrains.Issues"
versionCode = 1
versionName = "1.0"
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
kotlin {
jvmToolchain(11)
}
}
dependencies {
implementation(project(":common"))
implementation("androidx.activity:activity-compose:1.5.0")
}

3
examples/issues/android/src/main/AndroidManifest.xml
Unescape View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.myapplication">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:allowBackup="true"

16
examples/issues/common/build.gradle.kts
Unescape View File

@ -22,8 +22,9 @@ kotlin {
named("androidMain") {
kotlin.srcDirs("src/jvmAndAndroidMain/kotlin")
dependencies {
api("androidx.appcompat:appcompat:1.5.1")
api("androidx.core:core-ktx:1.8.0")
api("androidx.activity:activity-compose:1.7.2")
api("androidx.appcompat:appcompat:1.6.1")
api("androidx.core:core-ktx:1.10.1")
}
}
named("desktopMain") {
@ -39,17 +40,18 @@ apollo {
android {
compileSdk = 34
namespace = "com.example.myapplication.common"
defaultConfig {
minSdk = 26
targetSdk = 34
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
kotlin {
jvmToolchain(11)
}
sourceSets {
named("main") {
manifest.srcFile("src/androidMain/AndroidManifest.xml")

2
examples/issues/common/src/androidMain/AndroidManifest.xml
Unescape View File

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="com.example.myapplication.common"/>
<manifest />

2
examples/issues/gradle.properties
Unescape View File

@ -20,5 +20,5 @@ android.useAndroidX=true
# Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true
kotlin.version=1.9.0
agp.version=7.1.3
agp.version=8.0.2
compose.version=1.5.0-rc04

2
examples/issues/gradle/wrapper/gradle-wrapper.properties vendored
Unescape View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

6
examples/minesweeper/androidApp/build.gradle.kts
Unescape View File

@ -5,7 +5,7 @@ plugins {
}
kotlin {
android()
androidTarget()
sourceSets {
val androidMain by getting {
dependencies {
@ -17,6 +17,7 @@ kotlin {
android {
compileSdk = 34
namespace = "org.jetbrains.minesweeper"
defaultConfig {
applicationId = "org.jetbrains.ComposeMinesweeper"
minSdk = 26
@ -28,4 +29,7 @@ android {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
kotlin {
jvmToolchain(11)
}
}

3
examples/minesweeper/androidApp/src/androidMain/AndroidManifest.xml
Unescape View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.jetbrains.minesweeper">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:allowBackup="true"

2
examples/minesweeper/gradle.properties
Unescape View File

@ -10,7 +10,7 @@ kotlin.mpp.androidSourceSetLayoutVersion=2
# Enable kotlin/native experimental memory model
kotlin.native.binary.memoryModel=experimental
kotlin.version=1.9.0
agp.version=7.1.3
agp.version=8.0.2
compose.version=1.5.0-rc04
# TODO: remove when switching to 1.9.10. See: https://youtrack.jetbrains.com/issue/KT-60852

2
examples/minesweeper/gradle/wrapper/gradle-wrapper.properties vendored
Unescape View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

11
examples/minesweeper/shared/build.gradle.kts
Unescape View File

@ -12,7 +12,7 @@ plugins {
version = "1.0-SNAPSHOT"
kotlin {
android()
androidTarget()
jvm("desktop")
@ -73,9 +73,9 @@ kotlin {
}
val androidMain by getting {
dependencies {
api("androidx.activity:activity-compose:1.6.1")
api("androidx.activity:activity-compose:1.7.2")
api("androidx.appcompat:appcompat:1.6.1")
api("androidx.core:core-ktx:1.9.0")
api("androidx.core:core-ktx:1.10.1")
}
}
val iosMain by creating {
@ -117,16 +117,19 @@ kotlin {
android {
compileSdk = 34
namespace = "org.jetbrains.minesweeper"
sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
sourceSets["main"].res.srcDirs("src/androidMain/res")
sourceSets["main"].resources.srcDirs("src/commonMain/resources")
defaultConfig {
minSdk = 26
targetSdk = 34
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
kotlin {
jvmToolchain(11)
}
}

2
examples/minesweeper/shared/src/androidMain/AndroidManifest.xml
Unescape View File

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.jetbrains.minesweeper"/>
<manifest />

2
examples/notepad/gradle/wrapper/gradle-wrapper.properties vendored
Unescape View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

6
examples/todoapp-lite/androidApp/build.gradle.kts
Unescape View File

@ -5,7 +5,7 @@ plugins {
}
kotlin {
android()
androidTarget()
sourceSets {
val androidMain by getting {
dependencies {
@ -18,6 +18,7 @@ kotlin {
android {
compileSdk = 34
namespace = "example.todoapp.lite"
defaultConfig {
applicationId = "org.jetbrains.TodoAppLite"
minSdk = 26
@ -29,4 +30,7 @@ android {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
kotlin {
jvmToolchain(11)
}
}

3
examples/todoapp-lite/androidApp/src/androidMain/AndroidManifest.xml
Unescape View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="example.todoapp.lite">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:allowBackup="true"

2
examples/todoapp-lite/gradle.properties
Unescape View File

@ -10,5 +10,5 @@ kotlin.mpp.androidSourceSetLayoutVersion=2
# Enable kotlin/native experimental memory model
kotlin.native.binary.memoryModel=experimental
kotlin.version=1.9.0
agp.version=7.1.3
agp.version=8.0.2
compose.version=1.5.0-rc04

2
examples/todoapp-lite/gradle/wrapper/gradle-wrapper.properties vendored
Unescape View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

11
examples/todoapp-lite/shared/build.gradle.kts
Unescape View File

@ -9,7 +9,7 @@ plugins {
version = "1.0-SNAPSHOT"
kotlin {
android()
androidTarget()
jvm("desktop")
@ -36,9 +36,9 @@ kotlin {
}
val androidMain by getting {
dependencies {
api("androidx.activity:activity-compose:1.6.1")
api("androidx.activity:activity-compose:1.7.2")
api("androidx.appcompat:appcompat:1.6.1")
api("androidx.core:core-ktx:1.9.0")
api("androidx.core:core-ktx:1.10.1")
}
}
val iosMain by creating {
@ -63,16 +63,19 @@ kotlin {
android {
compileSdk = 34
namespace = "example.todoapp.lite.common"
sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
sourceSets["main"].res.srcDirs("src/androidMain/res")
sourceSets["main"].resources.srcDirs("src/commonMain/resources")
defaultConfig {
minSdk = 26
targetSdk = 34
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
kotlin {
jvmToolchain(11)
}
}

2
examples/todoapp-lite/shared/src/androidMain/AndroidManifest.xml
Unescape View File

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="example.todoapp.lite.common"/>
<manifest />

6
examples/visual-effects/androidApp/build.gradle.kts
Unescape View File

@ -5,7 +5,7 @@ plugins {
}
kotlin {
android()
androidTarget()
sourceSets {
val androidMain by getting {
dependencies {
@ -17,6 +17,7 @@ kotlin {
android {
compileSdk = 34
namespace = "org.jetbrains.compose.demo.visuals"
defaultConfig {
applicationId = "org.jetbrains.VisualEffects"
minSdk = 26
@ -28,4 +29,7 @@ android {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
kotlin {
jvmToolchain(11)
}
}

3
examples/visual-effects/androidApp/src/androidMain/AndroidManifest.xml
Unescape View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.jetbrains.compose.demo.visuals">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:allowBackup="true"

2
examples/visual-effects/gradle.properties
Unescape View File

@ -10,5 +10,5 @@ kotlin.native.useEmbeddableCompilerJar=true
# Enable kotlin/native experimental memory model
kotlin.native.binary.memoryModel=experimental
kotlin.version=1.9.0
agp.version=7.1.3
agp.version=8.0.2
compose.version=1.5.0-rc04

2
examples/visual-effects/gradle/wrapper/gradle-wrapper.properties vendored
Unescape View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

11
examples/visual-effects/shared/build.gradle.kts
Unescape View File

@ -7,7 +7,7 @@ plugins {
version = "1.0-SNAPSHOT"
kotlin {
android()
androidTarget()
jvm("desktop")
@ -35,9 +35,9 @@ kotlin {
}
val androidMain by getting {
dependencies {
api("androidx.activity:activity-compose:1.6.1")
api("androidx.activity:activity-compose:1.7.2")
api("androidx.appcompat:appcompat:1.6.1")
api("androidx.core:core-ktx:1.9.0")
api("androidx.core:core-ktx:1.10.1")
}
}
val iosMain by creating {
@ -62,16 +62,19 @@ kotlin {
android {
compileSdk = 34
namespace = "org.jetbrains.visualeffects"
sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
sourceSets["main"].res.srcDirs("src/androidMain/res")
sourceSets["main"].resources.srcDirs("src/commonMain/resources")
defaultConfig {
minSdk = 26
targetSdk = 34
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
kotlin {
jvmToolchain(11)
}
}

2
examples/visual-effects/shared/src/androidMain/AndroidManifest.xml
Unescape View File

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.jetbrains.visualeffects"/>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" />

6
examples/widgets-gallery/androidApp/build.gradle.kts
Unescape View File

@ -5,7 +5,7 @@ plugins {
}
kotlin {
android()
androidTarget()
sourceSets {
val androidMain by getting {
dependencies {
@ -17,6 +17,7 @@ kotlin {
android {
compileSdk = 34
namespace = "org.jetbrains.compose.demo.widgets"
defaultConfig {
applicationId = "org.jetbrains.WidgetsGallery"
minSdk = 26
@ -28,4 +29,7 @@ android {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
kotlin {
jvmToolchain(11)
}
}

3
examples/widgets-gallery/androidApp/src/androidMain/AndroidManifest.xml
Unescape View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.jetbrains.compose.demo.widgets">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:allowBackup="true"

2
examples/widgets-gallery/gradle.properties
Unescape View File

@ -10,5 +10,5 @@ kotlin.mpp.androidSourceSetLayoutVersion=2
# Enable kotlin/native experimental memory model
kotlin.native.binary.memoryModel=experimental
kotlin.version=1.9.0
agp.version=7.1.3
agp.version=8.0.2
compose.version=1.5.0-rc04

2
examples/widgets-gallery/gradle/wrapper/gradle-wrapper.properties vendored
Unescape View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

11
examples/widgets-gallery/shared/build.gradle.kts
Unescape View File

@ -9,7 +9,7 @@ plugins {
version = "1.0-SNAPSHOT"
kotlin {
android()
androidTarget()
jvm("desktop")
@ -37,9 +37,9 @@ kotlin {
}
val androidMain by getting {
dependencies {
api("androidx.activity:activity-compose:1.6.1")
api("androidx.activity:activity-compose:1.7.2")
api("androidx.appcompat:appcompat:1.6.1")
api("androidx.core:core-ktx:1.9.0")
api("androidx.core:core-ktx:1.10.1")
}
}
val iosMain by creating {
@ -64,16 +64,19 @@ kotlin {
android {
compileSdk = 34
namespace = "org.jetbrains.compose.demo.widgets.platform"
sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
sourceSets["main"].res.srcDirs("src/androidMain/res")
sourceSets["main"].resources.srcDirs("src/commonMain/resources")
defaultConfig {
minSdk = 26
targetSdk = 34
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
kotlin {
jvmToolchain(11)
}
}

2
examples/widgets-gallery/shared/src/androidMain/AndroidManifest.xml
Unescape View File

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="org.jetbrains.compose.demo.widgets.platform"/>
<manifest />
Write Preview
Loading…
Cancel
Save