Skip to content

Commit

Permalink
Remove Kotlin BOM (#67)
Browse files Browse the repository at this point in the history
* Update gradle plugin version.

* Rollback dependencies.

* Fix powermock missing dependency and revert browser dependency to original value.

* Update CHANGELOG.
  • Loading branch information
sshropshire authored Jul 17, 2023
1 parent f9000ae commit a015e45
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 25 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# browser-switch-android Release Notes

## unreleased

* Revert `androidx.annotation:annotation` dependency to version `1.2.0`
* Revert `androidx.appcompat:appcompat` dependency to version `1.3.1`

## 2.4.0

* Remove Jetifier now that AndroidX is fully supported
Expand Down
26 changes: 8 additions & 18 deletions browser-switch/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,30 +28,20 @@ android {
}

dependencies {
implementation 'androidx.annotation:annotation:1.6.0'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.fragment:fragment:1.5.7'
implementation 'androidx.browser:browser:1.5.0'
implementation deps.annotation
implementation deps.appcompat
implementation deps.browser

// Ref: https://kotlinlang.org/docs/whatsnew18.html#usage-of-the-latest-kotlin-stdlib-version-in-transitive-dependencies
// TODO: remove once we migrate to Kotlin
implementation platform("org.jetbrains.kotlin:kotlin-bom:1.8.0")
testImplementation deps.junit
testImplementation deps.mockitoCore
testImplementation deps.jsonassert
testImplementation deps.robolectric

testImplementation 'junit:junit:4.13.2'
testImplementation 'org.mockito:mockito-core:3.3.3'
// TODO: remove powermock
testImplementation 'org.powermock:powermock-module-junit4:2.0.9'
testImplementation 'org.powermock:powermock-module-junit4-rule:2.0.9'
testImplementation 'org.powermock:powermock-classloading-xstream:2.0.9'
testImplementation 'org.powermock:powermock-api-mockito2:2.0.9'
testImplementation 'org.skyscreamer:jsonassert:1.5.1'

testImplementation 'org.robolectric:robolectric:4.7.3'

androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test:rules:1.5.0'
androidTestImplementation 'androidx.test:runner:1.5.2'
androidTestImplementation 'org.mockito:mockito-android:2.28.2'
androidTestImplementation "androidx.fragment:fragment-testing:1.5.7"
}

// region signing and publishing
Expand Down
15 changes: 14 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,21 @@ buildscript {
url = "https://plugins.gradle.org/m2/"
}
}

ext.deps = [
'annotation' : 'androidx.annotation:annotation:1.2.0',
'appcompat' : 'androidx.appcompat:appcompat:1.3.1',
'browser' : 'androidx.browser:browser:1.5.0',

// test dependencies
'junit' : 'junit:junit:4.13.2',
'mockitoCore' : 'org.mockito:mockito-core:3.3.3',
'jsonassert' : 'org.skyscreamer:jsonassert:1.5.1',
'robolectric' : 'org.robolectric:robolectric:4.7.3'
]

dependencies {
classpath 'com.android.tools.build:gradle:7.2.2'
classpath 'com.android.tools.build:gradle:7.4.2'
}
}

Expand Down
6 changes: 3 additions & 3 deletions demo/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ android {

dependencies {
implementation project(':browser-switch')
implementation "androidx.annotation:annotation:1.6.0"
implementation "androidx.appcompat:appcompat:1.6.1"
implementation "androidx.fragment:fragment:1.5.7"
implementation "androidx.annotation:annotation:1.3.0"
implementation "androidx.appcompat:appcompat:1.3.1"
implementation "androidx.fragment:fragment:1.3.6"

androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
Expand Down
6 changes: 3 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Tue Sep 06 09:17:36 CDT 2022
#Mon Jul 17 09:55:05 CDT 2023
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit a015e45

Please sign in to comment.