Skip to content

Convert Plaid to use AndroidX #524

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

Merged
merged 17 commits into from
Oct 21, 2018
Merged

Convert Plaid to use AndroidX #524

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
dd2ebf7
Initial commit after AndroidX conversion using Android Studio refacto…
tiembo Oct 12, 2018
6b23efa
Bump Glide to 4.8.0, which supports AndroidX annotations
tiembo Oct 12, 2018
8e60a35
Fix dex error with PathSegment
tiembo Oct 12, 2018
75b8ffd
Fix error with type mismatch
tiembo Oct 12, 2018
d2cefa3
Temporarily comment out plusAssign usage. App runs now
tiembo Oct 12, 2018
3a038ef
Clean up imports
tiembo Oct 12, 2018
aba91a9
Attempt to fix core-runtime CI error
tiembo Oct 12, 2018
b38f2cf
Upgrade Kotlin and Gradle wrapper versions
tiembo Oct 12, 2018
0c5a3d6
Extract versions out of build.gradle files
tiembo Oct 12, 2018
44dc2ba
Address PR comments from Nick
tiembo Oct 17, 2018
0a5a5a3
Address PR comment from Florina
tiembo Oct 17, 2018
a520c32
Rename version variable names
tiembo Oct 17, 2018
7aad300
Update palette params for applyFullImage and applyTopPalette
tiembo Oct 17, 2018
27fbae9
Fix format violations
tiembo Oct 17, 2018
9715e2f
Workaround for dependency conflict during assembleAndroidTest
tiembo Oct 17, 2018
a997200
Fix instrumentation tests
tiembo Oct 21, 2018
4109a57
Update Kotlin to 1.3.0-rc-190
tiembo Oct 21, 2018
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Extract versions out of build.gradle files
  • Loading branch information
@tiembo
tiembo committed Oct 12, 2018
commit 0c5a3d62a83ecf400de376f4b4e6e7c3a6bf3c2a
10 changes: 5 additions & 5 deletions about/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,15 @@ dependencies {
kapt "com.google.dagger:dagger-compiler:${versions.dagger}"

testImplementation project(':test_shared')
testImplementation 'androidx.arch.core:core-testing:2.0.0'
testImplementation "androidx.arch.core:core-testing:${versions.lifecycle}"
testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:${versions.mockito_kotlin}"
testImplementation "junit:junit:${versions.junit}"

androidTestImplementation project(':test_shared')
androidTestImplementation 'androidx.arch.core:core-testing:2.0.0'
androidTestImplementation 'androidx.test:runner:1.1.0-beta02'
androidTestImplementation 'androidx.test:rules:1.1.0-beta02'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-beta02'
androidTestImplementation "androidx.arch.core:core-testing:${versions.lifecycle}"
androidTestImplementation "androidx.test:runner:${versions.test_runner}"
androidTestImplementation "androidx.test:rules:${versions.test_rules}"
androidTestImplementation "androidx.test.espresso:espresso-core:${versions.espresso}"
androidTestImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:${versions.mockito_kotlin}"
androidTestImplementation "org.mockito:mockito-android:${versions.mockito}"
androidTestImplementation "org.mockito:mockito-core:${versions.mockito}"
Expand Down
6 changes: 3 additions & 3 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@ dependencies {
implementation "com.crashlytics.sdk.android:crashlytics:${versions.crashlytics}"
implementation "com.google.firebase:firebase-core:${versions.firebase}"

androidTestImplementation 'androidx.test:rules:1.1.0-beta02'
androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.1.0-beta02'
androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0-beta02'
androidTestImplementation "androidx.test:rules:${versions.test_rules}"
androidTestImplementation "androidx.test.espresso:espresso-contrib:${versions.espresso}"
androidTestImplementation "androidx.test.uiautomator:uiautomator:${versions.ui_automator}"
kapt "com.google.dagger:dagger-compiler:${versions.dagger}"
}

Expand Down
15 changes: 8 additions & 7 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ buildscript {
'compileSdk' : 28,
'minSdk' : 23,
'targetSdk' : 28,
'constraintLayout' : '1.1.3',
'constraintLayout' : '2.0.0-alpha2',
'coreKtx' : '1.0.0',
'coroutines' : '0.26.1-eap13',
'crashlytics' : '2.9.4',
'dagger' : '2.16',
'espresso' : '3.0.2',
'espresso' : '3.1.0-beta02',
'fabric' : '1.25.4',
'firebase' : '16.0.1',
'glide' : '4.8.0',
Expand All @@ -35,17 +35,18 @@ buildscript {
'junit' : '4.12',
'kotlin' : '1.3.0-rc-146',
'ktlint' : '0.24.0',
'lifecycle' : '1.1.1',
'legacy_support' : '1.0.0',
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This name seems strange?
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Split into a few different versions - androidx, legacyCoreUtils, and material. androidx feels generic though - suggestions for something better?
'lifecycle' : '2.0.0',
'mockito' : '2.23.0',
'mockito_kotlin' : '2.0.0-RC3',
'okhttp' : '3.10.0',
'retrofit' : '2.4.0',
'retrofitCoroutines': '0.9.2',
'room' : '1.1.1',
'room' : '2.1.0-alpha01',
'supportLibrary' : '27.1.1',
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this be removed now?
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes! 🎉
'test_rules' : '1.0.2',
'test_runner' : '1.0.2',
'ui_automator' : '2.1.3'
'test_rules' : '1.1.0-beta02',
'test_runner' : '1.1.0-beta02',
'ui_automator' : '2.2.0-beta02'
]
ext.names = [
'applicationId': 'io.plaidapp'
Expand Down
33 changes: 16 additions & 17 deletions core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,14 @@ repositories {
dependencies {
api project(':bypass')

api 'androidx.room:room-runtime:2.1.0-alpha01'
api "androidx.room:room-runtime:${versions.room}"
api "androidx.core:core-ktx:${versions.coreKtx}"
api 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2'
api 'androidx.browser:browser:1.0.0'
api 'com.google.android.material:material:1.0.0'
api 'androidx.palette:palette:1.0.0'
api 'androidx.recyclerview:recyclerview:1.0.0'
api 'androidx.dynamicanimation:dynamicanimation:1.0.0'
api "androidx.constraintlayout:constraintlayout:${versions.constraintLayout}"
api "androidx.browser:browser:${versions.legacy_support}"
api "com.google.android.material:material:${versions.legacy_support}"
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Move down to maintain alphabetic order?
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved it down, though I wanted to avoid alphabetizing the list to limit the PR size.
api "androidx.palette:palette:${versions.legacy_support}"
api "androidx.recyclerview:recyclerview:${versions.legacy_support}"
api "androidx.dynamicanimation:dynamicanimation:${versions.legacy_support}"
api "com.github.bumptech.glide:glide:${versions.glide}"
api "com.github.bumptech.glide:okhttp3-integration:${versions.glide}"
api "com.github.bumptech.glide:recyclerview-integration:${versions.glide}"
Expand All @@ -88,12 +88,11 @@ dependencies {
api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}"
api "org.jetbrains.kotlinx:kotlinx-coroutines-core:${versions.coroutines}"
api "org.jetbrains.kotlinx:kotlinx-coroutines-android:${versions.coroutines}"
api "com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:" +
"${versions.retrofitCoroutines}"
api "com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:${versions.retrofitCoroutines}"
api "org.jsoup:jsoup:${versions.jsoup}"
api 'androidx.lifecycle:lifecycle-viewmodel:2.0.0'
api 'androidx.lifecycle:lifecycle-extensions:2.0.0'
kapt 'androidx.room:room-compiler:2.1.0-alpha01'
api "androidx.lifecycle:lifecycle-viewmodel:${versions.lifecycle}"
api "androidx.lifecycle:lifecycle-extensions:${versions.lifecycle}"
kapt "androidx.room:room-compiler:${versions.room}"
kapt "com.github.bumptech.glide:compiler:${versions.glide}"
kapt "com.google.dagger:dagger-compiler:${versions.dagger}"

Expand All @@ -104,16 +103,16 @@ dependencies {
testImplementation "org.mockito:mockito-core:${versions.mockito}"

androidTestImplementation project(':test_shared')
androidTestImplementation 'androidx.test:runner:1.1.0-beta02'
androidTestImplementation 'androidx.test:rules:1.1.0-beta02'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-beta02'
androidTestImplementation "androidx.test:runner:${versions.test_runner}"
androidTestImplementation "androidx.test:rules:${versions.test_rules}"
androidTestImplementation "androidx.test.espresso:espresso-core:${versions.espresso}"
androidTestImplementation "org.mockito:mockito-core:${versions.mockito}"
androidTestImplementation "org.mockito:mockito-android:${versions.mockito}"
androidTestImplementation "com.squareup.retrofit2:retrofit-mock:${versions.retrofit}"

// Work around issue with runtime classpath version conflict
androidTestImplementation 'androidx.legacy:legacy-support-core-utils:1.0.0'
androidTestImplementation 'androidx.lifecycle:lifecycle-runtime:2.0.0'
androidTestImplementation "androidx.legacy:legacy-support-core-utils:${versions.legacy_support}"
androidTestImplementation "androidx.lifecycle:lifecycle-runtime:${versions.lifecycle}"
}

kotlin {
Expand Down
6 changes: 3 additions & 3 deletions designernews/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,14 @@ dependencies {

testImplementation project(':test_shared')

testImplementation 'androidx.arch.core:core-testing:2.0.0'
testImplementation "androidx.arch.core:core-testing:${versions.lifecycle}"
testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:${versions.mockito_kotlin}"
testImplementation "junit:junit:${versions.junit}"
testImplementation "org.mockito:mockito-core:${versions.mockito}"

// Work around issue with runtime classpath version conflict
androidTestImplementation 'androidx.legacy:legacy-support-core-utils:1.0.0'
androidTestImplementation 'androidx.lifecycle:lifecycle-runtime:2.0.0'
androidTestImplementation "androidx.legacy:legacy-support-core-utils:${versions.legacy_support}"
androidTestImplementation "androidx.lifecycle:lifecycle-runtime:${versions.lifecycle}"
}

kotlin {
Expand Down
6 changes: 3 additions & 3 deletions dribbble/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,14 @@ dependencies {
kapt "com.google.dagger:dagger-compiler:${versions.dagger}"

testImplementation project(':test_shared')
testImplementation 'androidx.arch.core:core-testing:2.0.0'
testImplementation "androidx.arch.core:core-testing:${versions.lifecycle}"
testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:${versions.mockito_kotlin}"
testImplementation "junit:junit:${versions.junit}"
testImplementation "org.mockito:mockito-core:${versions.mockito}"

// Work around issue with runtime classpath version conflict
androidTestImplementation 'androidx.legacy:legacy-support-core-utils:1.0.0'
androidTestImplementation 'androidx.lifecycle:lifecycle-runtime:2.0.0'
androidTestImplementation "androidx.legacy:legacy-support-core-utils:${versions.legacy_support}"
androidTestImplementation "androidx.lifecycle:lifecycle-runtime:${versions.lifecycle}"
}

kotlin {
Expand Down
2 changes: 1 addition & 1 deletion third_party/bypass/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ repositories {

dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'androidx.annotation:annotation:1.0.0'
implementation "androidx.annotation:annotation:${versions.legacy_support}"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}"
}