diff --git a/.gitignore b/.gitignore
index 7b363e17d55..1292cbd8591 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,37 +1,18 @@
-# Intellij files
-
-.idea/*
-!.idea/copyright
-!.idea/scopes
+prebuilds/fullsdk-linux
+prebuilds/fullsdk-darwin
+out
 *.iml
-
-# Mac OS files
-
+.gradle
+/local.properties
+/.idea
+/.idea/caches
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+/.idea/navEditor.xml
+/.idea/assetWizardSettings.xml
 .DS_Store
-
-# Compiled class file
-*.class
-
-# Log files
-*.log
-hs_err_pid*
-*.hprof
-
-# Package Files #
-*.jar
-!gradle-wrapper.jar
-
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
-
-# gradle
 build/
-.gradle
-
-# Android
 /captures
-/local.properties
\ No newline at end of file
+.externalNativeBuild
+.cxx
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
index 82905da6a98..cf855ae414f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "compose/external/doclava"]
 	path = compose/external/doclava
 	url = https://android.googlesource.com/platform/external/doclava
+[submodule "compose/prebuilts/androidx/internal"]
+	path = compose/prebuilts/androidx/internal
+	url = https://android.googlesource.com/platform/prebuilts/androidx/internal
diff --git a/compose/.run/build extended icons.run.xml b/compose/.run/build extended icons.run.xml
index d75e655a801..b02cd3b8148 100644
--- a/compose/.run/build extended icons.run.xml	
+++ b/compose/.run/build extended icons.run.xml	
@@ -4,7 +4,7 @@
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
       <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="-Pandroidx.compose.multiplatformEnabled=true -Pandroidx.versionExtraCheckEnabled=false -Pandroidx.alternativeProjectUrl=https://github.com/JetBrains/compose-jb --max-workers=1" />
+      <option name="scriptParameters" value="--max-workers=1 -Pandroidx.compose.multiplatformEnabled=true -Pandroidx.versionExtraCheckEnabled=false -Pandroidx.alternativeProjectUrl=https://github.com/JetBrains/compose-jb" />
       <option name="taskDescriptions">
         <list />
       </option>
diff --git a/compose/README.md b/compose/README.md
index 1cabe0cf5d7..0fb4b4cacc4 100644
--- a/compose/README.md
+++ b/compose/README.md
@@ -15,13 +15,13 @@ git config --global submodule.recurse true
 - Java 11 (should be specified in JAVA_HOME)
 - Android SDK (should be specified in ANDROID_SDK_ROOT. Can be downloaded via `./scripts/downloadAndroidSdk` on Linux/macOS)
   - Android 11
-  - Build-Tools 30.0.2
+  - Build-Tools 30.0.3
   - NDK 21.3.6528147 (in folder $androidSdk/ndk, not in $androidSdk/ndk/$version)
   - CMake 3.10.2.4988404 (in folder $androidSdk/cmake, not in $androidSdk/cmake/$version)
 
 ## Requirements to develop in IDE
 - Android Studio Arctic Fox | 2020.3.1 Canary 15
-- Custom Gradle 7.0 specified in `Settings -> Build, Execution, Deployment -> Build Tools -> Gradle` (because Android Studio will pick the wrong Gradle in the subproject instead of the Gradle in the root project)
+- Custom Gradle 7.1 specified in `Settings -> Build, Execution, Deployment -> Build Tools -> Gradle` (because Android Studio will pick the wrong Gradle in the subproject instead of the Gradle in the root project)
 - Specified Gradle JDK 11 in `... -> Build Tools -> Gradle`
 - Environment variables:
 ```
diff --git a/compose/frameworks/support b/compose/frameworks/support
index e50399d67a9..fbd01f557a7 160000
--- a/compose/frameworks/support
+++ b/compose/frameworks/support
@@ -1 +1 @@
-Subproject commit e50399d67a9d5c8cc1bf6bd7db1a953d83e632c5
+Subproject commit fbd01f557a72ff79e685f2e15c6317208365c453
diff --git a/compose/gradle/wrapper/gradle-wrapper.properties b/compose/gradle/wrapper/gradle-wrapper.properties
index 3c4101c3ec4..1acc777d741 100644
--- a/compose/gradle/wrapper/gradle-wrapper.properties
+++ b/compose/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/compose/prebuilts/androidx/internal b/compose/prebuilts/androidx/internal
new file mode 160000
index 00000000000..f37dc6b42fe
--- /dev/null
+++ b/compose/prebuilts/androidx/internal
@@ -0,0 +1 @@
+Subproject commit f37dc6b42fe7838e9e37fbe8a9eb063a1550acd8
diff --git a/compose/scripts/downloadAndroidSdk b/compose/scripts/downloadAndroidSdk
index 42ec6735e75..7f438aa19da 100755
--- a/compose/scripts/downloadAndroidSdk
+++ b/compose/scripts/downloadAndroidSdk
@@ -16,7 +16,7 @@ downloadLinuxSDK() {
     clone ../prebuilts/fullsdk-linux/platforms/android-30 https://android.googlesource.com/platform/prebuilts/fullsdk/platforms/android-30 master
     clone ../prebuilts/fullsdk-linux/sources/android-30 https://android.googlesource.com/platform/prebuilts/fullsdk/sources/android-30 master
     clone ../prebuilts/fullsdk-linux/ndk https://android.googlesource.com/toolchain/prebuilts/ndk/r21 master
-    clone ../prebuilts/fullsdk-linux/build-tools/30.0.2 https://android.googlesource.com/platform/prebuilts/fullsdk-linux/build-tools/30.0.2 master
+    clone ../prebuilts/fullsdk-linux/build-tools/30.0.3 https://android.googlesource.com/platform/prebuilts/fullsdk-linux/build-tools/30.0.3 master
     clone ../prebuilts/fullsdk-linux/platform-tools https://android.googlesource.com/platform/prebuilts/fullsdk-linux/platform-tools master
     clone ../prebuilts/fullsdk-linux/tools https://android.googlesource.com/platform/prebuilts/fullsdk-linux/tools master
     clone ../prebuilts/fullsdk-linux/cmake https://android.googlesource.com/platform/prebuilts/cmake/linux-x86 de5fa1c66d3bdcbf2bbc62d2504ec6b0b0fb74e1
@@ -26,10 +26,10 @@ downloadMacOsSDK() {
     clone ../prebuilts/fullsdk-darwin/platforms/android-30 https://android.googlesource.com/platform/prebuilts/fullsdk/platforms/android-30 master
     clone ../prebuilts/fullsdk-darwin/sources/android-30 https://android.googlesource.com/platform/prebuilts/fullsdk/sources/android-30 master
     clone ../prebuilts/fullsdk-darwin/ndk https://android.googlesource.com/toolchain/prebuilts/ndk-darwin/r21 master
-    clone ../prebuilts/fullsdk-darwin/build-tools/30.0.2 https://android.googlesource.com/platform/prebuilts/fullsdk-darwin/build-tools/30.0.2 master
+    clone ../prebuilts/fullsdk-darwin/build-tools/30.0.3 https://android.googlesource.com/platform/prebuilts/fullsdk-darwin/build-tools/30.0.3 master
     clone ../prebuilts/fullsdk-darwin/platform-tools https://android.googlesource.com/platform/prebuilts/fullsdk-darwin/platform-tools master
     clone ../prebuilts/fullsdk-darwin/tools https://android.googlesource.com/platform/prebuilts/fullsdk-darwin/tools master
-    clone ../prebuilts/fullsdk-darwin/cmake https://android.googlesource.com/platform/prebuilts/cmake/darwin-x86 de5fa1c66d3bdcbf2bbc62d2504ec6b0b0fb74e1
+    clone ../prebuilts/fullsdk-darwin/cmake https://android.googlesource.com/platform/prebuilts/cmake/darwin-x86 fc59035d8c856055f2a263dc8a2f9de96c959cc2
 }
 
 if [[ "$OSTYPE" == "linux-gnu"* ]]; then