Skip to content

Commit

Permalink
Upgrade to Android 14 (#438)
Browse files Browse the repository at this point in the history
* Update compile and target SDK versions to 34

* Update CHANGELOG

* Remove unecessary lint options

* Update CHANGELOG.md

Co-authored-by: Jax DesMarais-Leder <[email protected]>

---------

Co-authored-by: Jax DesMarais-Leder <[email protected]>
  • Loading branch information
sarahkoop and jaxdesmarais committed Sep 18, 2023
1 parent 2014024 commit 3816b5b
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

## unreleased

* Bump braintree_android module dependency versions to `4.38.0`
* Bump braintree_android module dependency versions to `4.38.1`
* Android 14 Support
* Upgrade `compileSdkVersion` and `targetSdkVersion` to API 34

## 6.12.0

Expand Down
4 changes: 2 additions & 2 deletions Drop-In/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ android {
}

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

sourceSets {
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
}
}

ext.brainTreeVersion = "4.38.0"
ext.brainTreeVersion = "4.38.1"

ext.deps = [
"braintreeCore" : "com.braintreepayments.api:braintree-core:$brainTreeVersion",
Expand Down Expand Up @@ -36,9 +36,9 @@ plugins {

version '6.12.1-SNAPSHOT'
ext {
compileSdkVersion = 33
compileSdkVersion = 34
minSdkVersion = 21
targetSdkVersion = 33
targetSdkVersion = 34
versionCode = 105
versionName = version
}
Expand Down

0 comments on commit 3816b5b

Please sign in to comment.