Merge branch 'main' into compose-mp-1.6.0

chrisbanes · Feb 2, 2024 · ea66931 · ea66931
2 parents c37fceb + f2281d7
commit ea66931
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/wrapper-validation-action@v2
 
       - name: Setup JDK
         uses: actions/setup-java@v4
@@ -50,15 +50,15 @@ jobs:
 
       - name: Upload reports
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: android-reports
           path: |
             **/build/reports/*
 
       - name: Upload test results
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: android-test-results
           path: |

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,15 +3,15 @@
 
 
 plugins {
-    id("com.android.library") version "8.2.0" apply false
-    id("com.android.application") version "8.2.0" apply false
+    id("com.android.library") version "8.2.2" apply false
+    id("com.android.application") version "8.2.2" apply false
 
-    kotlin("multiplatform") version "1.9.21" apply false
-    id("org.jetbrains.kotlin.android") version "1.9.21" apply false
-    id("org.jetbrains.compose") version "1.6.0-alpha01" apply false
+    kotlin("multiplatform") version "1.9.22" apply false
+    id("org.jetbrains.kotlin.android") version "1.9.22" apply false
+    id("org.jetbrains.compose") version "1.6.0-beta01" apply false
 
     id("com.diffplug.spotless") version "6.21.0"
-    id("com.vanniktech.maven.publish") version "0.25.3"
+    id("com.vanniktech.maven.publish") version "0.27.0"
 }
 
 allprojects {

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/sample/android-app/build.gradle.kts b/sample/android-app/build.gradle.kts
@@ -33,5 +33,5 @@ android {
 
 dependencies {
     implementation(project(":sample:shared"))
-    implementation("androidx.activity:activity-compose:1.8.1")
+    implementation("androidx.activity:activity-compose:1.8.2")
 }