diff --git a/.buildscript/configure-android-defaults.gradle b/.buildscript/configure-android-defaults.gradle
index a2bb16397e..dc0f1fa440 100644
--- a/.buildscript/configure-android-defaults.gradle
+++ b/.buildscript/configure-android-defaults.gradle
@@ -1,5 +1,5 @@
 android {
-  compileSdkVersion Versions.targetSdk
+  compileSdkVersion Versions.compileSdk
 
   compileOptions {
     sourceCompatibility JavaVersion.VERSION_1_8
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
index d36c6ba212..94c52a5310 100644
--- a/buildSrc/src/main/java/Dependencies.kt
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -4,6 +4,7 @@ import java.util.Locale.US
 import kotlin.reflect.full.declaredMembers
 
 object Versions {
+  const val compileSdk = 31
   const val targetSdk = 30
 }
 
diff --git a/samples/dungeon/app/src/main/java/com/squareup/sample/dungeon/Component.kt b/samples/dungeon/app/src/main/java/com/squareup/sample/dungeon/Component.kt
index 415c1cd5b4..7f598ddc6b 100644
--- a/samples/dungeon/app/src/main/java/com/squareup/sample/dungeon/Component.kt
+++ b/samples/dungeon/app/src/main/java/com/squareup/sample/dungeon/Component.kt
@@ -36,6 +36,7 @@ class Component(context: AppCompatActivity) {
   @OptIn(ExperimentalTime::class)
   val clock = Monotonic
 
+  @Suppress("DEPRECATION")
   val vibrator = context.getSystemService(VIBRATOR_SERVICE) as Vibrator
 
   val boardLoader = BoardLoader(
diff --git a/samples/tutorial/tutorial-1-complete/build.gradle b/samples/tutorial/tutorial-1-complete/build.gradle
index e9a8e7dc9d..576f340f82 100644
--- a/samples/tutorial/tutorial-1-complete/build.gradle
+++ b/samples/tutorial/tutorial-1-complete/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 android {
-  compileSdkVersion 30
+  compileSdkVersion 31
 
   defaultConfig {
     applicationId "com.squareup.workflow.tutorial"
diff --git a/samples/tutorial/tutorial-2-complete/build.gradle b/samples/tutorial/tutorial-2-complete/build.gradle
index 3ca4c50683..440b8a95a3 100644
--- a/samples/tutorial/tutorial-2-complete/build.gradle
+++ b/samples/tutorial/tutorial-2-complete/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 android {
-  compileSdkVersion 30
+  compileSdkVersion 31
 
   defaultConfig {
     applicationId "workflow.tutorial"
diff --git a/samples/tutorial/tutorial-3-complete/build.gradle b/samples/tutorial/tutorial-3-complete/build.gradle
index 3ca4c50683..440b8a95a3 100644
--- a/samples/tutorial/tutorial-3-complete/build.gradle
+++ b/samples/tutorial/tutorial-3-complete/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 android {
-  compileSdkVersion 30
+  compileSdkVersion 31
 
   defaultConfig {
     applicationId "workflow.tutorial"
diff --git a/samples/tutorial/tutorial-4-complete/build.gradle b/samples/tutorial/tutorial-4-complete/build.gradle
index 3ca4c50683..440b8a95a3 100644
--- a/samples/tutorial/tutorial-4-complete/build.gradle
+++ b/samples/tutorial/tutorial-4-complete/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 android {
-  compileSdkVersion 30
+  compileSdkVersion 31
 
   defaultConfig {
     applicationId "workflow.tutorial"
diff --git a/samples/tutorial/tutorial-base/build.gradle b/samples/tutorial/tutorial-base/build.gradle
index 04c913e82c..5666297ef6 100644
--- a/samples/tutorial/tutorial-base/build.gradle
+++ b/samples/tutorial/tutorial-base/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 android {
-  compileSdkVersion 30
+  compileSdkVersion 31
 
   defaultConfig {
     applicationId "workflow.tutorial"
diff --git a/samples/tutorial/tutorial-final/build.gradle b/samples/tutorial/tutorial-final/build.gradle
index 2da17f57e0..b1a2d8d488 100644
--- a/samples/tutorial/tutorial-final/build.gradle
+++ b/samples/tutorial/tutorial-final/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 android {
-  compileSdkVersion 30
+  compileSdkVersion 31
 
   defaultConfig {
     applicationId "workflow.tutorial"
diff --git a/samples/tutorial/tutorial-views/build.gradle b/samples/tutorial/tutorial-views/build.gradle
index 976a33218f..480b9aaff2 100644
--- a/samples/tutorial/tutorial-views/build.gradle
+++ b/samples/tutorial/tutorial-views/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 android {
-  compileSdkVersion 30
+  compileSdkVersion 31
 
   defaultConfig {
     minSdkVersion 21