Skip to content

Commit 3816b5b

Browse files
Upgrade to Android 14 (#438)
* Update compile and target SDK versions to 34 * Update CHANGELOG * Remove unecessary lint options * Update CHANGELOG.md Co-authored-by: Jax DesMarais-Leder <jax.desmarais@gmail.com> --------- Co-authored-by: Jax DesMarais-Leder <jax.desmarais@gmail.com>
1 parent 2014024 commit 3816b5b

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
## unreleased
44

5-
* Bump braintree_android module dependency versions to `4.38.0`
5+
* Bump braintree_android module dependency versions to `4.38.1`
6+
* Android 14 Support
7+
* Upgrade `compileSdkVersion` and `targetSdkVersion` to API 34
68

79
## 6.12.0
810

Drop-In/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ android {
4444
}
4545

4646
lintOptions {
47-
warning 'GradleCompatible'
47+
// RestrictedApi - Accessing Braintree Core SDK non-public methods
48+
warning 'GradleCompatible', 'RestrictedApi'
4849
textReport true
4950
textOutput 'stdout'
50-
disable 'InvalidPackage' // The Cardinal SDK is referencing the `javax.naming` package but it is unavailable
5151
}
5252

5353
sourceSets {

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
}
88
}
99

10-
ext.brainTreeVersion = "4.38.0"
10+
ext.brainTreeVersion = "4.38.1"
1111

1212
ext.deps = [
1313
"braintreeCore" : "com.braintreepayments.api:braintree-core:$brainTreeVersion",
@@ -36,9 +36,9 @@ plugins {
3636

3737
version '6.12.1-SNAPSHOT'
3838
ext {
39-
compileSdkVersion = 33
39+
compileSdkVersion = 34
4040
minSdkVersion = 21
41-
targetSdkVersion = 33
41+
targetSdkVersion = 34
4242
versionCode = 105
4343
versionName = version
4444
}

0 commit comments

Comments
 (0)