Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Android Gradle Plugin to 4.0.0 #2525

Merged
merged 2 commits into from
May 28, 2020
Merged

Upgrade Android Gradle Plugin to 4.0.0 #2525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36638d1
Upgrade Android Gradle Plugin to 4.0.0
mshafrir-stripe May 28, 2020
f46ef4c
Suppress lint warnings
mshafrir-stripe May 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions example/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,8 @@ android {
}
}

viewBinding {
enabled = true
buildFeatures {
viewBinding true
}
}

Expand Down
4 changes: 2 additions & 2 deletions stripe/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@ android {
outputDirectory = "${project.rootDir}/docs/"
}

viewBinding {
enabled = true
buildFeatures {
viewBinding true
}
}

Expand Down
3 changes: 3 additions & 0 deletions stripe/src/main/java/com/stripe/android/PaymentSessionConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.stripe.android

import android.annotation.SuppressLint
import android.os.Parcelable
import androidx.annotation.LayoutRes
import androidx.annotation.WorkerThread
Expand Down Expand Up @@ -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 {
Expand All @@ -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 {
Expand Down