From 24231c8fdc5088898d729e536a3d4cf7d50c6592 Mon Sep 17 00:00:00 2001
From: Jens Klingenberg <mail@jensklingenberg.de>
Date: Fri, 5 May 2023 09:52:29 +0200
Subject: [PATCH] Update to Compose 1.4.3

---
 app/build.gradle                         | 4 ++--
 build.gradle                             | 4 ++--
 docs/desktop/overview.md                 | 2 +-
 docs/ios/overview.md                     | 8 ++++++++
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 mkdocs.yml                               | 3 ++-
 settings.gradle => settings.gradle.kts   | 2 +-
 7 files changed, 17 insertions(+), 8 deletions(-)
 create mode 100644 docs/ios/overview.md
 rename settings.gradle => settings.gradle.kts (86%)

diff --git a/app/build.gradle b/app/build.gradle
index 9ef616a21..2929e3950 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -57,7 +57,7 @@ android {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion "1.4.0"
+        kotlinCompilerExtensionVersion "1.4.6"
     }
 }
 
@@ -85,7 +85,7 @@ subprojects {
 dependencies {
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "androidx.activity:activity-compose:1.6.1"
+    implementation "androidx.activity:activity-compose:1.7.1"
     implementation "androidx.appcompat:appcompat:1.6.1"
     implementation "androidx.compose.animation:animation-core:$compose_version"
     implementation "androidx.compose.animation:animation:$compose_version"
diff --git a/build.gradle b/build.gradle
index 161063c73..d5831d28a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,8 +3,8 @@
 
 buildscript {
     ext {
-        compose_version = '1.4.2'
-        kotlin_version = "1.8.0"
+        compose_version = '1.4.3'
+        kotlin_version = "1.8.20"
     }
     repositories {
         google()
diff --git a/docs/desktop/overview.md b/docs/desktop/overview.md
index 07658407e..f71c83b53 100644
--- a/docs/desktop/overview.md
+++ b/docs/desktop/overview.md
@@ -5,4 +5,4 @@ JetBrains released a Compose port for the desktop.
 
 You can find more information here https://www.jetbrains.com/lp/compose/ or on their Github Repo https://github.com/JetBrains/compose-multiplatform or in the Kotlin Slack  [#compose-desktop](https://kotlinlang.slack.com/archives/C01D6HTPATV)
 
-<iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/ar2Wcr9or_k" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+<iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/Mgf_9kxM1BA" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
diff --git a/docs/ios/overview.md b/docs/ios/overview.md
new file mode 100644
index 000000000..28098d4cb
--- /dev/null
+++ b/docs/ios/overview.md
@@ -0,0 +1,8 @@
+# Compose on iOS
+
+JetBrains released a Compose port for iOS. It's currently in Alpha.
+<iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/FWVi4aV36d8" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+
+https://github.com/JetBrains/compose-multiplatform#ios
+
+You can find more information on the Kotlin Slack in channel "#compose-ios"
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ddf9ddf67..62e5b9e13 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed May 12 21:22:59 CEST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/mkdocs.yml b/mkdocs.yml
index 32598b8bf..3a5ac4e02 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -45,7 +45,7 @@ extra:
     composedoc: 'https://developer.android.com/reference/kotlin/androidx/compose'
     images: '../../images'
   compose:
-    release: "1.4.0"
+    release: "1.4.3"
   social:
     - icon: fontawesome/brands/github-alt
       link: 'https://github.com/foso'
@@ -171,6 +171,7 @@ nav:
       - 'Compose Projects': compose_projects.md
       - 'Contributing': contributing.md
       - 'Resources': resources.md
+      - 'iOS' : ios/overview.md
       - 'Web' : web/overview.md
 
 
diff --git a/settings.gradle b/settings.gradle.kts
similarity index 86%
rename from settings.gradle
rename to settings.gradle.kts
index a5dc21409..eef15cc86 100644
--- a/settings.gradle
+++ b/settings.gradle.kts
@@ -5,5 +5,5 @@ dependencyResolutionManagement {
 
     }
 }
-include ':app'
+include(":app")