diff --git a/.github/actions/setup-prerequisites/action.yml b/.github/actions/setup-prerequisites/action.yml
new file mode 100644
index 00000000000..8da31b1f976
--- /dev/null
+++ b/.github/actions/setup-prerequisites/action.yml
@@ -0,0 +1,24 @@
+name: 'Setup Prerequisites'
+runs:
+  using: "composite"
+  steps:
+    - name: Setup JDK 21
+      uses: actions/setup-java@v4
+      with:
+        java-version: '21'
+        distribution: 'jetbrains'
+      env:
+        GITHUB_TOKEN: ${{ github.token }}
+
+    - name: Setup Android SDK
+      uses: android-actions/setup-android@v4
+      with:
+        packages: platform-tools
+
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@v4
+      with:
+        cache-read-only: ${{ github.ref != 'refs/heads/master' }}
+        gradle-home-cache-excludes: |
+          caches/jars-9
+          caches/transforms-3
diff --git a/.github/actions/setup-xcode/action.yml b/.github/actions/setup-xcode/action.yml
new file mode 100644
index 00000000000..a31f6b4f8cc
--- /dev/null
+++ b/.github/actions/setup-xcode/action.yml
@@ -0,0 +1,26 @@
+name: 'Setup Xcode'
+inputs:
+  xcode-path:
+    description: 'Path to the Xcode app bundle to select.'
+    required: false
+    default: /Applications/Xcode_26.5.app
+  cache-key-suffix:
+    description: 'Suffix appended to the DerivedData cache key.'
+    required: false
+    default: 26.5
+runs:
+  using: "composite"
+  steps:
+    - name: Setup Xcode version
+      shell: bash
+      run: |
+        sudo xcode-select -s "${{ inputs.xcode-path }}"
+        /usr/bin/xcodebuild -version
+
+    - name: Cache Xcode DerivedData
+      uses: irgaly/xcode-cache@v1
+      with:
+        key: xcode-cache-deriveddata-${{ inputs.cache-key-suffix }}-${{ github.sha }}
+        restore-keys: |
+          xcode-cache-deriveddata-${{ inputs.cache-key-suffix }}-
+        cache-read-only: ${{ github.ref != 'refs/heads/master' }}
diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
new file mode 100644
index 00000000000..aaff7329ef0
--- /dev/null
+++ b/.github/workflows/examples.yml
@@ -0,0 +1,72 @@
+name: Validate examples
+
+on:
+  pull_request:
+    paths:
+      - 'examples/**'
+      - '.github/actions/**'
+      - '.github/workflows/examples.yml'
+  push:
+    branches:
+      - master
+    paths:
+      - 'examples/**'
+      - '.github/actions/**'
+      - '.github/workflows/examples.yml'
+  workflow_dispatch:
+
+jobs:
+  desktop:
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v5
+
+      - name: Setup Prerequisites
+        uses: ./.github/actions/setup-prerequisites
+
+      - name: Validate desktop examples
+        working-directory: examples
+        run: ./validateExamples.sh
+
+  web:
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v5
+
+      - name: Setup Prerequisites
+        uses: ./.github/actions/setup-prerequisites
+
+      - name: Validate web examples
+        working-directory: examples
+        run: ./validateExamplesWithJs.sh
+
+  android:
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v5
+
+      - name: Setup Prerequisites
+        uses: ./.github/actions/setup-prerequisites
+
+      - name: Validate Android examples
+        working-directory: examples
+        run: ./validateExamplesAndroid.sh
+
+  ios:
+    runs-on: macos-26-xlarge
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v5
+
+      - name: Setup Prerequisites
+        uses: ./.github/actions/setup-prerequisites
+
+      - name: Setup Xcode
+        uses: ./.github/actions/setup-xcode
+
+      - name: Validate iOS examples
+        working-directory: examples
+        run: ./validateExamplesIos.sh
diff --git a/examples/chat/androidApp/build.gradle.kts b/examples/chat/androidApp/build.gradle.kts
index 0989b9d8127..451cfc5e3c5 100644
--- a/examples/chat/androidApp/build.gradle.kts
+++ b/examples/chat/androidApp/build.gradle.kts
@@ -17,7 +17,9 @@ dependencies {
 }
 
 android {
-    compileSdk = 37
+    compileSdk {
+        version = release(37) { minorApiLevel = 1 }
+    }
     namespace = "org.jetbrains.chat"
     defaultConfig {
         applicationId = "org.jetbrains.Chat"
diff --git a/examples/chat/shared/build.gradle.kts b/examples/chat/shared/build.gradle.kts
index 26fa833559d..ff9bca138dc 100644
--- a/examples/chat/shared/build.gradle.kts
+++ b/examples/chat/shared/build.gradle.kts
@@ -46,7 +46,9 @@ kotlin {
 
     android {
         namespace = "org.jetbrains.chat.shared"
-        compileSdk = 37
+        compileSdk {
+            version = release(37) { minorApiLevel = 1 }
+        }
         minSdk = 26
 
         androidResources {
diff --git a/examples/codeviewer/androidApp/build.gradle.kts b/examples/codeviewer/androidApp/build.gradle.kts
index 73dc76e8e73..c02e2e322d4 100644
--- a/examples/codeviewer/androidApp/build.gradle.kts
+++ b/examples/codeviewer/androidApp/build.gradle.kts
@@ -17,7 +17,9 @@ dependencies {
 }
 
 android {
-    compileSdk = 37
+    compileSdk {
+        version = release(37) { minorApiLevel = 1 }
+    }
     namespace = "org.jetbrains.codeviewer"
     defaultConfig {
         applicationId = "org.jetbrains.Codeviewer"
diff --git a/examples/codeviewer/shared/build.gradle.kts b/examples/codeviewer/shared/build.gradle.kts
index 3a56c77ab9e..a509d3b44ce 100644
--- a/examples/codeviewer/shared/build.gradle.kts
+++ b/examples/codeviewer/shared/build.gradle.kts
@@ -25,7 +25,9 @@ kotlin {
     }
 
     android {
-        compileSdk = 37
+        compileSdk {
+            version = release(37) { minorApiLevel = 1 }
+        }
         namespace = "org.jetbrains.codeviewer.common"
         minSdk = 26
 
diff --git a/examples/graphics-2d/androidApp/build.gradle.kts b/examples/graphics-2d/androidApp/build.gradle.kts
index c4b6f011dc1..5614ccbd320 100644
--- a/examples/graphics-2d/androidApp/build.gradle.kts
+++ b/examples/graphics-2d/androidApp/build.gradle.kts
@@ -18,7 +18,9 @@ dependencies {
 }
 
 android {
-    compileSdk = 37
+    compileSdk {
+        version = release(37) { minorApiLevel = 1 }
+    }
     namespace = "org.jetbrains.graphics2d"
     defaultConfig {
         applicationId = "org.jetbrains.Graphics2D"
diff --git a/examples/graphics-2d/shared/build.gradle.kts b/examples/graphics-2d/shared/build.gradle.kts
index aedb304a02f..c9042743bf1 100644
--- a/examples/graphics-2d/shared/build.gradle.kts
+++ b/examples/graphics-2d/shared/build.gradle.kts
@@ -35,7 +35,9 @@ kotlin {
 
     android {
         namespace = "org.jetbrains.Graphics2D"
-        compileSdk = 37
+        compileSdk {
+            version = release(37) { minorApiLevel = 1 }
+        }
         minSdk = 26
 
         androidResources {
diff --git a/examples/imageviewer/androidApp/build.gradle.kts b/examples/imageviewer/androidApp/build.gradle.kts
index bd813b9a83b..726f5d93edb 100755
--- a/examples/imageviewer/androidApp/build.gradle.kts
+++ b/examples/imageviewer/androidApp/build.gradle.kts
@@ -19,7 +19,9 @@ dependencies {
 }
 
 android {
-    compileSdk = 37
+    compileSdk {
+        version = release(37) { minorApiLevel = 1 }
+    }
     namespace = "example.imageviewer"
     defaultConfig {
         applicationId = "org.jetbrains.Imageviewer"
diff --git a/examples/imageviewer/shared/build.gradle.kts b/examples/imageviewer/shared/build.gradle.kts
index 8aa8ad040ec..b753f781eee 100755
--- a/examples/imageviewer/shared/build.gradle.kts
+++ b/examples/imageviewer/shared/build.gradle.kts
@@ -34,7 +34,9 @@ kotlin {
 
     android {
         namespace = "example.imageviewer.shared"
-        compileSdk = 37
+        compileSdk {
+            version = release(37) { minorApiLevel = 1 }
+        }
         minSdk = 26
 
         androidResources {
diff --git a/examples/issues/android/build.gradle.kts b/examples/issues/android/build.gradle.kts
index ff3c821345e..7d82e30c7ca 100644
--- a/examples/issues/android/build.gradle.kts
+++ b/examples/issues/android/build.gradle.kts
@@ -13,7 +13,9 @@ kotlin {
 }
 
 android {
-    compileSdk = 37
+    compileSdk {
+        version = release(37) { minorApiLevel = 1 }
+    }
     namespace = "com.example.myapplication"
 
     defaultConfig {
diff --git a/examples/issues/common/build.gradle.kts b/examples/issues/common/build.gradle.kts
index 29a3611cb0e..6d4096f5a58 100644
--- a/examples/issues/common/build.gradle.kts
+++ b/examples/issues/common/build.gradle.kts
@@ -13,7 +13,9 @@ kotlin {
 
     android {
         namespace = "com.example.myapplication.common"
-        compileSdk = 37
+        compileSdk {
+            version = release(37) { minorApiLevel = 1 }
+        }
         minSdk = 26
 
         compilerOptions {
diff --git a/examples/nav_cupcake/androidApp/build.gradle.kts b/examples/nav_cupcake/androidApp/build.gradle.kts
index 0dddeb031cb..7f3a3dd4da5 100644
--- a/examples/nav_cupcake/androidApp/build.gradle.kts
+++ b/examples/nav_cupcake/androidApp/build.gradle.kts
@@ -21,7 +21,9 @@ dependencies {
 }
 
 android {
-    compileSdk = 37
+    compileSdk {
+        version = release(37) { minorApiLevel = 1 }
+    }
     namespace = "org.jetbrains.nav_cupcake"
     defaultConfig {
         applicationId = "org.jetbrains.nav_cupcake"
diff --git a/examples/nav_cupcake/shared/build.gradle.kts b/examples/nav_cupcake/shared/build.gradle.kts
index 5050470d5cd..d2b81e22656 100644
--- a/examples/nav_cupcake/shared/build.gradle.kts
+++ b/examples/nav_cupcake/shared/build.gradle.kts
@@ -26,7 +26,9 @@ kotlin {
 
     android {
         namespace = "org.jetbrains.nav_cupcake.shared"
-        compileSdk = 37
+        compileSdk {
+            version = release(37) { minorApiLevel = 1 }
+        }
         minSdk = 26
 
         androidResources {
diff --git a/examples/validateExamples.sh b/examples/validateExamples.sh
index 326620f3494..e398a58cb88 100755
--- a/examples/validateExamples.sh
+++ b/examples/validateExamples.sh
@@ -5,17 +5,30 @@
 
 set -euo pipefail
 
-if [ "$#" -ne 2 ]; then
-echo "Specify Compose and Kotlin version. For example: ./validateExamples.sh 1.1.1 1.6.10"
-exit 1
+if [ "$#" -gt 2 ]; then
+    echo "Optionally specify Compose and Kotlin versions. For example: ./validateExamples.sh 1.13.0-alpha03 2.3.20"
+    exit 1
+fi
+
+version_args=()
+if [ "$#" -eq 1 ]; then
+    version_args=("-Pcompose.version=$1")
+fi
+
+if [ "$#" -eq 2 ]; then
+    version_args=("-Pcompose.version=$1" "-Pkotlin.version=$2")
 fi
-COMPOSE_VERSION=$1
-KOTLIN_VERSION=$2
 
 
 runGradle() {
-    pushd $1
-    ./gradlew $2 -Pcompose.version=$COMPOSE_VERSION -Pkotlin.version=$KOTLIN_VERSION
+    local example="$1"
+    local task="$2"
+    pushd "$example"
+    if [ "${#version_args[@]}" -gt 0 ]; then
+        ./gradlew "$task" "${version_args[@]}"
+    else
+        ./gradlew "$task"
+    fi
     popd
 }
 
diff --git a/examples/validateExamplesAndroid.sh b/examples/validateExamplesAndroid.sh
index 7082681793a..aeab9104b7d 100755
--- a/examples/validateExamplesAndroid.sh
+++ b/examples/validateExamplesAndroid.sh
@@ -5,23 +5,35 @@
 
 set -euo pipefail
 
-if [ "$#" -ne 2 ]; then
-echo "Specify Compose and Kotlin version. For example: ./validateExamplesAndroid.sh 1.1.1 1.6.10"
-exit 1
+if [ "$#" -gt 2 ]; then
+    echo "Optionally specify Compose and Kotlin versions. For example: ./validateExamplesAndroid.sh 1.13.0-alpha03 2.3.20"
+    exit 1
+fi
+
+version_args=()
+if [ "$#" -eq 1 ]; then
+    version_args=("-Pcompose.version=$1")
+fi
+
+if [ "$#" -eq 2 ]; then
+    version_args=("-Pcompose.version=$1" "-Pkotlin.version=$2")
 fi
-COMPOSE_VERSION=$1
-KOTLIN_VERSION=$2
 
 
 runGradle() {
-    pushd $1
-    ./gradlew $2 -Pcompose.version=$COMPOSE_VERSION -Pkotlin.version=$KOTLIN_VERSION --rerun-tasks
+    local example="$1"
+    local task="$2"
+    pushd "$example"
+    if [ "${#version_args[@]}" -gt 0 ]; then
+        ./gradlew "$task" "${version_args[@]}" --rerun-tasks
+    else
+        ./gradlew "$task" --rerun-tasks
+    fi
     popd
 }
 
-# requires an emulator running or an Android device to be connected
-runGradle chat installDebug
-runGradle codeviewer installDebug
-runGradle imageviewer installDebug
-runGradle issues installDebug
-runGradle graphics-2d installDebug
+runGradle chat assembleDebug
+runGradle codeviewer assembleDebug
+runGradle imageviewer assembleDebug
+runGradle issues assembleDebug
+runGradle graphics-2d assembleDebug
diff --git a/examples/validateExamplesIos.sh b/examples/validateExamplesIos.sh
index 9c474eae5f5..5fd23b337d6 100755
--- a/examples/validateExamplesIos.sh
+++ b/examples/validateExamplesIos.sh
@@ -5,18 +5,30 @@
 
 set -euo pipefail
 
-if [ "$#" -ne 2 ]; then
-echo "Specify Compose and Kotlin version. For example: ./validateExamplesIos.sh 1.1.1 1.6.10"
-exit 1
+if [ "$#" -gt 2 ]; then
+    echo "Optionally specify Compose and Kotlin versions. For example: ./validateExamplesIos.sh 1.13.0-alpha03 2.3.20"
+    exit 1
+fi
+
+version_args=()
+if [ "$#" -eq 1 ]; then
+    version_args=("-Pcompose.version=$1")
+fi
+
+if [ "$#" -eq 2 ]; then
+    version_args=("-Pcompose.version=$1" "-Pkotlin.version=$2")
 fi
-COMPOSE_VERSION=$1
-KOTLIN_VERSION=$2
 
 
 runGradle() {
-    pushd $1
-    echo "Validating $1"
-    ./gradlew clean linkIosArm64 -Pcompose.version=$COMPOSE_VERSION -Pkotlin.version=$KOTLIN_VERSION --rerun-tasks || (echo "Failed $1" && exit 1)
+    local example="$1"
+    pushd "$example"
+    echo "Validating $example"
+    if [ "${#version_args[@]}" -gt 0 ]; then
+        ./gradlew clean linkIosArm64 "${version_args[@]}" --rerun-tasks || (echo "Failed $example" && exit 1)
+    else
+        ./gradlew clean linkIosArm64 --rerun-tasks || (echo "Failed $example" && exit 1)
+    fi
     popd
 }
 
diff --git a/examples/validateExamplesWithJs.sh b/examples/validateExamplesWithJs.sh
index 254fccee2e8..5636a251556 100755
--- a/examples/validateExamplesWithJs.sh
+++ b/examples/validateExamplesWithJs.sh
@@ -5,17 +5,30 @@
 
 set -euo pipefail
 
-if [ "$#" -ne 2 ]; then
-echo "Specify Compose and Kotlin version. For example: ./validateExamplesWithJs.sh 1.1.1 1.6.10"
-exit 1
+if [ "$#" -gt 2 ]; then
+    echo "Optionally specify Compose and Kotlin versions. For example: ./validateExamplesWithJs.sh 1.13.0-alpha03 2.3.20"
+    exit 1
+fi
+
+version_args=()
+if [ "$#" -eq 1 ]; then
+    version_args=("-Pcompose.version=$1")
+fi
+
+if [ "$#" -eq 2 ]; then
+    version_args=("-Pcompose.version=$1" "-Pkotlin.version=$2")
 fi
-COMPOSE_VERSION=$1
-KOTLIN_VERSION=$2
 
 
 runGradle() {
-    pushd $1
-    ./gradlew $2 -Pcompose.version=$COMPOSE_VERSION -Pkotlin.version=$KOTLIN_VERSION
+    local example="$1"
+    local task="$2"
+    pushd "$example"
+    if [ "${#version_args[@]}" -gt 0 ]; then
+        ./gradlew "$task" "${version_args[@]}"
+    else
+        ./gradlew "$task"
+    fi
     popd
 }
 
diff --git a/gradle-plugins/compose/src/test/test-projects/application/hotReload/build.gradle b/gradle-plugins/compose/src/test/test-projects/application/hotReload/build.gradle
index cc751be84de..8e914fe5d98 100644
--- a/gradle-plugins/compose/src/test/test-projects/application/hotReload/build.gradle
+++ b/gradle-plugins/compose/src/test/test-projects/application/hotReload/build.gradle
@@ -10,7 +10,9 @@ kotlin {
     // like https://youtrack.jetbrains.com/issue/CMP-2345
     android {
         namespace = "org.jetbrains.compose.testapp"
-        compileSdk = 37
+        compileSdk {
+            version = release(37) { minorApiLevel = 1 }
+        }
         minSdk = 23
     }
 
diff --git a/gradle-plugins/compose/src/test/test-projects/application/mpp/build.gradle b/gradle-plugins/compose/src/test/test-projects/application/mpp/build.gradle
index 88857312833..74b277a6fe6 100644
--- a/gradle-plugins/compose/src/test/test-projects/application/mpp/build.gradle
+++ b/gradle-plugins/compose/src/test/test-projects/application/mpp/build.gradle
@@ -15,7 +15,9 @@ kotlin {
     // like https://youtrack.jetbrains.com/issue/CMP-2345
     android {
         namespace = "org.jetbrains.compose.testapp"
-        compileSdk = 37
+        compileSdk {
+            version = release(37) { minorApiLevel = 1 }
+        }
         minSdk = 23
     }
 
diff --git a/gradle-plugins/compose/src/test/test-projects/application/newAndroidTarget/build.gradle b/gradle-plugins/compose/src/test/test-projects/application/newAndroidTarget/build.gradle
index 3ad95f32b71..06e5438536c 100644
--- a/gradle-plugins/compose/src/test/test-projects/application/newAndroidTarget/build.gradle
+++ b/gradle-plugins/compose/src/test/test-projects/application/newAndroidTarget/build.gradle
@@ -10,7 +10,9 @@ kotlin {
 
     android {
         namespace = "com.google.samples.apps.diceroller.shared"
-        compileSdk = 37
+        compileSdk {
+            version = release(37) { minorApiLevel = 1 }
+        }
     }
 
     jvm()
@@ -25,4 +27,4 @@ kotlin {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/gradle-plugins/compose/src/test/test-projects/application/nonJvm/build.gradle b/gradle-plugins/compose/src/test/test-projects/application/nonJvm/build.gradle
index 88ef9ac2c94..34c68acde28 100644
--- a/gradle-plugins/compose/src/test/test-projects/application/nonJvm/build.gradle
+++ b/gradle-plugins/compose/src/test/test-projects/application/nonJvm/build.gradle
@@ -8,7 +8,9 @@ plugins {
 kotlin {
     android {
         namespace = "org.jetbrains.compose.testapp"
-        compileSdk = 37
+        compileSdk {
+            version = release(37) { minorApiLevel = 1 }
+        }
         minSdk = 23
     }
     iosArm64()
diff --git a/gradle-plugins/compose/src/test/test-projects/misc/androidAppWithResources/appModule/build.gradle.kts b/gradle-plugins/compose/src/test/test-projects/misc/androidAppWithResources/appModule/build.gradle.kts
index 05171c6eb81..2eeda8e76d7 100644
--- a/gradle-plugins/compose/src/test/test-projects/misc/androidAppWithResources/appModule/build.gradle.kts
+++ b/gradle-plugins/compose/src/test/test-projects/misc/androidAppWithResources/appModule/build.gradle.kts
@@ -6,7 +6,9 @@ plugins {
 
 android {
     namespace = "me.sample.app"
-    compileSdk = 37
+    compileSdk {
+        version = release(37) { minorApiLevel = 1 }
+    }
     defaultConfig {
         applicationId = "org.example.project"
         minSdk = 24
diff --git a/gradle-plugins/compose/src/test/test-projects/misc/androidAppWithResources/featureModule/build.gradle.kts b/gradle-plugins/compose/src/test/test-projects/misc/androidAppWithResources/featureModule/build.gradle.kts
index 2d6a69362dc..7de1c4e623a 100644
--- a/gradle-plugins/compose/src/test/test-projects/misc/androidAppWithResources/featureModule/build.gradle.kts
+++ b/gradle-plugins/compose/src/test/test-projects/misc/androidAppWithResources/featureModule/build.gradle.kts
@@ -10,7 +10,9 @@ kotlin {
 
     android {
         namespace = "me.sample.feature"
-        compileSdk = 37
+        compileSdk {
+            version = release(37) { minorApiLevel = 1 }
+        }
         minSdk = 24
         androidResources.enable = true
     }
@@ -31,4 +33,4 @@ compose.desktop {
 
 compose.resources {
     publicResClass = true
-}
\ No newline at end of file
+}
diff --git a/gradle-plugins/compose/src/test/test-projects/misc/commonResources/build.gradle.kts b/gradle-plugins/compose/src/test/test-projects/misc/commonResources/build.gradle.kts
index 9da37e09fbb..a400937a730 100644
--- a/gradle-plugins/compose/src/test/test-projects/misc/commonResources/build.gradle.kts
+++ b/gradle-plugins/compose/src/test/test-projects/misc/commonResources/build.gradle.kts
@@ -9,7 +9,9 @@ group = "app.group"
 
 kotlin {
     android {
-        compileSdk = 37
+        compileSdk {
+            version = release(37) { minorApiLevel = 1 }
+        }
         namespace = "org.jetbrains.compose.resources.test"
         minSdk = 23
         androidResources.enable = true
diff --git a/gradle-plugins/compose/src/test/test-projects/misc/compatibilityLibCheck/build.gradle.kts b/gradle-plugins/compose/src/test/test-projects/misc/compatibilityLibCheck/build.gradle.kts
index b12dd216a80..a35f78beaf8 100644
--- a/gradle-plugins/compose/src/test/test-projects/misc/compatibilityLibCheck/build.gradle.kts
+++ b/gradle-plugins/compose/src/test/test-projects/misc/compatibilityLibCheck/build.gradle.kts
@@ -8,7 +8,9 @@ plugins {
 kotlin {
     android {
         namespace = "org.company.app"
-        compileSdk = 37
+        compileSdk {
+            version = release(37) { minorApiLevel = 1 }
+        }
         minSdk = 23
         androidResources.enable = true
     }
diff --git a/gradle-plugins/compose/src/test/test-projects/misc/fullTargetsAppWithResources/androidApp/build.gradle.kts b/gradle-plugins/compose/src/test/test-projects/misc/fullTargetsAppWithResources/androidApp/build.gradle.kts
index 6b2aecae162..a093ea88c4c 100644
--- a/gradle-plugins/compose/src/test/test-projects/misc/fullTargetsAppWithResources/androidApp/build.gradle.kts
+++ b/gradle-plugins/compose/src/test/test-projects/misc/fullTargetsAppWithResources/androidApp/build.gradle.kts
@@ -4,7 +4,9 @@ plugins {
 
 android {
     namespace = "org.company.app.androidApp"
-    compileSdk = 37
+    compileSdk {
+        version = release(37) { minorApiLevel = 1 }
+    }
 
     defaultConfig {
         minSdk = 24
diff --git a/gradle-plugins/compose/src/test/test-projects/misc/fullTargetsAppWithResources/sharedUI/build.gradle.kts b/gradle-plugins/compose/src/test/test-projects/misc/fullTargetsAppWithResources/sharedUI/build.gradle.kts
index 8b6f3948b4a..0eb5bc5dd65 100644
--- a/gradle-plugins/compose/src/test/test-projects/misc/fullTargetsAppWithResources/sharedUI/build.gradle.kts
+++ b/gradle-plugins/compose/src/test/test-projects/misc/fullTargetsAppWithResources/sharedUI/build.gradle.kts
@@ -12,7 +12,9 @@ plugins {
 kotlin {
     android {
         namespace = "org.company.app"
-        compileSdk = 37
+        compileSdk {
+            version = release(37) { minorApiLevel = 1 }
+        }
         minSdk = 24
         androidResources.enable = true
     }
diff --git a/gradle-plugins/compose/src/test/test-projects/misc/kmpResourcePublication/appModule/build.gradle.kts b/gradle-plugins/compose/src/test/test-projects/misc/kmpResourcePublication/appModule/build.gradle.kts
index f7618be7c0a..9c146dd94d6 100644
--- a/gradle-plugins/compose/src/test/test-projects/misc/kmpResourcePublication/appModule/build.gradle.kts
+++ b/gradle-plugins/compose/src/test/test-projects/misc/kmpResourcePublication/appModule/build.gradle.kts
@@ -7,7 +7,9 @@ plugins {
 
 kotlin {
     android {
-        compileSdk = 37
+        compileSdk {
+            version = release(37) { minorApiLevel = 1 }
+        }
         namespace = "me.sample.app"
         minSdk = 23
         androidResources.enable = true
diff --git a/gradle-plugins/compose/src/test/test-projects/misc/kmpResourcePublication/cmplib/build.gradle.kts b/gradle-plugins/compose/src/test/test-projects/misc/kmpResourcePublication/cmplib/build.gradle.kts
index e31b73261d2..ccdb0981545 100644
--- a/gradle-plugins/compose/src/test/test-projects/misc/kmpResourcePublication/cmplib/build.gradle.kts
+++ b/gradle-plugins/compose/src/test/test-projects/misc/kmpResourcePublication/cmplib/build.gradle.kts
@@ -18,7 +18,9 @@ publishing {
 
 kotlin {
     android {
-        compileSdk = 37
+        compileSdk {
+            version = release(37) { minorApiLevel = 1 }
+        }
         namespace = "me.sample.library"
         minSdk = 23
         androidResources.enable = true
@@ -42,4 +44,4 @@ kotlin {
 compose.resources {
     publicResClass = true
     packageOfResClass = "me.sample.library.resources"
-}
\ No newline at end of file
+}
diff --git a/gradle-plugins/compose/src/test/test-projects/misc/kmpResourcePublication/featureModule/build.gradle.kts b/gradle-plugins/compose/src/test/test-projects/misc/kmpResourcePublication/featureModule/build.gradle.kts
index e8584b863de..70004d88b7a 100644
--- a/gradle-plugins/compose/src/test/test-projects/misc/kmpResourcePublication/featureModule/build.gradle.kts
+++ b/gradle-plugins/compose/src/test/test-projects/misc/kmpResourcePublication/featureModule/build.gradle.kts
@@ -7,7 +7,9 @@ plugins {
 
 kotlin {
     android {
-        compileSdk = 37
+        compileSdk {
+            version = release(37) { minorApiLevel = 1 }
+        }
         namespace = "me.sample.feature"
         minSdk = 23
         androidResources.enable = true
diff --git a/gradle-plugins/compose/src/test/test-projects/misc/oldAndroidTargetAppWithResources/appModule/build.gradle.kts b/gradle-plugins/compose/src/test/test-projects/misc/oldAndroidTargetAppWithResources/appModule/build.gradle.kts
index 6c22c0fffe6..0731e186098 100644
--- a/gradle-plugins/compose/src/test/test-projects/misc/oldAndroidTargetAppWithResources/appModule/build.gradle.kts
+++ b/gradle-plugins/compose/src/test/test-projects/misc/oldAndroidTargetAppWithResources/appModule/build.gradle.kts
@@ -6,7 +6,9 @@ plugins {
 
 android {
     namespace = "me.sample.app"
-    compileSdk = 37
+    compileSdk {
+        version = release(37) { minorApiLevel = 1 }
+    }
     defaultConfig {
         applicationId = "org.example.project"
         minSdk = 23
diff --git a/gradle-plugins/compose/src/test/test-projects/misc/oldAndroidTargetAppWithResources/featureModule/build.gradle.kts b/gradle-plugins/compose/src/test/test-projects/misc/oldAndroidTargetAppWithResources/featureModule/build.gradle.kts
index ae02afc667b..dc09bc2fd7a 100644
--- a/gradle-plugins/compose/src/test/test-projects/misc/oldAndroidTargetAppWithResources/featureModule/build.gradle.kts
+++ b/gradle-plugins/compose/src/test/test-projects/misc/oldAndroidTargetAppWithResources/featureModule/build.gradle.kts
@@ -20,9 +20,11 @@ kotlin {
 }
 android {
     namespace = "me.sample.feature"
-    compileSdk = 37
+    compileSdk {
+        version = release(37) { minorApiLevel = 1 }
+    }
 }
 
 compose.resources {
     publicResClass = true
-}
\ No newline at end of file
+}
diff --git a/gradle-plugins/compose/src/test/test-projects/misc/oldComposePlugin/build.gradle b/gradle-plugins/compose/src/test/test-projects/misc/oldComposePlugin/build.gradle
index dc28258fef8..97ec626b53b 100644
--- a/gradle-plugins/compose/src/test/test-projects/misc/oldComposePlugin/build.gradle
+++ b/gradle-plugins/compose/src/test/test-projects/misc/oldComposePlugin/build.gradle
@@ -11,7 +11,9 @@ kotlin {
     // like https://youtrack.jetbrains.com/issue/CMP-2345
     android {
         namespace = "org.jetbrains.compose.testapp"
-        compileSdk = 37
+        compileSdk {
+            version = release(37) { minorApiLevel = 1 }
+        }
         minSdk = 23
     }