diff --git a/build.gradle b/build.gradle
index ba98771a161..23ea6a86133 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.3'
+        classpath 'com.android.tools.build:gradle:4.0.0'
         classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.6'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokkaVersion"
diff --git a/example/build.gradle b/example/build.gradle
index 249c4e81faf..a4c02353365 100644
--- a/example/build.gradle
+++ b/example/build.gradle
@@ -165,8 +165,8 @@ android {
         }
     }
 
-    viewBinding {
-        enabled = true
+    buildFeatures {
+        viewBinding true
     }
 }
 
diff --git a/stripe/build.gradle b/stripe/build.gradle
index 86399b360b0..246277f3d3a 100644
--- a/stripe/build.gradle
+++ b/stripe/build.gradle
@@ -105,8 +105,8 @@ android {
         outputDirectory = "${project.rootDir}/docs/"
     }
 
-    viewBinding {
-        enabled = true
+    buildFeatures {
+        viewBinding true
     }
 }
 
diff --git a/stripe/src/main/java/com/stripe/android/PaymentSessionConfig.kt b/stripe/src/main/java/com/stripe/android/PaymentSessionConfig.kt
index d32b7a91108..cff283005f0 100644
--- a/stripe/src/main/java/com/stripe/android/PaymentSessionConfig.kt
+++ b/stripe/src/main/java/com/stripe/android/PaymentSessionConfig.kt
@@ -1,5 +1,6 @@
 package com.stripe.android
 
+import android.annotation.SuppressLint
 import android.os.Parcelable
 import androidx.annotation.LayoutRes
 import androidx.annotation.WorkerThread
@@ -121,6 +122,7 @@ data class PaymentSessionConfig internal constructor(
          * hidden in the shipping information screen. All fields will be shown if this list is
          * empty. Note that not all fields can be hidden, such as country or name.
          */
+        @SuppressLint("WrongConstant")
         fun setHiddenShippingInfoFields(
             @CustomizableShippingField vararg hiddenShippingInfoFields: String
         ): Builder = apply {
@@ -131,6 +133,7 @@ data class PaymentSessionConfig internal constructor(
          * @param optionalShippingInfoFields [CustomizableShippingField] fields that should be
          * optional in the [ShippingInfoWidget]
          */
+        @SuppressLint("WrongConstant")
         fun setOptionalShippingInfoFields(
             @CustomizableShippingField vararg optionalShippingInfoFields: String
         ): Builder = apply {