Skip to content

Migrate to androix #47

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

Closed
wants to merge 10 commits into from
Closed

Migrate to androix #47

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1288aee
make it compile with AS 3.2.1
martinbonnin Oct 13, 2018
5d2bef6
migrate to androidx
martinbonnin Oct 13, 2018
06ad857
trying to unbreak travis
martinbonnin Oct 13, 2018
f698320
simplify travis.yaml
martinbonnin Oct 13, 2018
94e8ad1
remove legacy appcompat, hopefull fix travis
martinbonnin Oct 13, 2018
973e2eb
use dependencies from dependencies.gradle
martinbonnin Oct 13, 2018
1537ebe
more debug info
martinbonnin Oct 13, 2018
7f6ea11
force the kotlin-reflect:1.2 dependency for all modules
martinbonnin Oct 13, 2018
443b995
use the same appcompat everywhere
martinbonnin Oct 13, 2018
de2bb01
add gradle.properties to git
martinbonnin Oct 13, 2018
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
Prev Previous commit
Next Next commit
use the same appcompat everywhere
  • Loading branch information
@martinbonnin
martinbonnin committed Oct 13, 2018
commit 443b995caefc5b87ca06166f78110dedc3ec4670
4 changes: 3 additions & 1 deletion dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ ext {
glideVersion = '4.8.0'
daggerVersion = '2.16' // As of today, 2.17 does not work. See https://issuetracker.google.com/issues/115738511
glassfishAnnotationVersion = '10.0-b28'
appCompatVersion = '1.0.0'

//Testing
robolectricVersion = '3.4.2'
Expand Down Expand Up @@ -165,7 +166,7 @@ ext {
javaxAnnotation: "javax.annotation:jsr250-api:${javaxAnnotationVersion}",
javaxInject: "javax.inject:javax.inject:${javaxInjectVersion}",
androidAnnotations: "androidx.annotation:annotation:1.0.0",
appCompat: "androidx.appcompat:appcompat:1.0.0",
appCompat: "androidx.appcompat:appcompat:${appCompatVersion}",
supportRecyclerView:"androidx.recyclerview:recyclerview:1.0.0",
supportDesign: "com.google.android.material:material:1.0.0-rc01",
Copy link

@ghost ghost Apr 22, 2019

Choose a reason for hiding this comment

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

I am pretty sure that when you use supportDesign library you don't need to add supportRecyclerView.

timber: "com.jakewharton.timber:timber:${timberVersion}",
Expand All @@ -186,6 +187,7 @@ ext {
espressoCore: "com.android.support.test.espresso:espresso-core:${espressoVersion}",
espressoIntents: "com.android.support.test.espresso:espresso-intents:${espressoVersion}",
espressoContrib: "com.android.support.test.espresso:espresso-contrib:${espressoVersion}",
appCompat: "androidx.appcompat:appcompat:${appCompatVersion}",
androidRunner: "com.android.support.test:runner:${runnerVersion}",
androidRules: "com.android.support.test:rules:${runnerVersion}"
]
Expand Down
1 change: 1 addition & 0 deletions mobile-ui/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ dependencies {
androidTestImplementation mobileUiTestDependencies.androidRules
androidTestImplementation mobileUiTestDependencies.espressoIntents
androidTestImplementation mobileUiTestDependencies.espressoContrib
androidTestImplementation mobileUiTestDependencies.appCompat

kaptTest mobileUiDependencies.daggerCompiler
kaptAndroidTest mobileUiDependencies.daggerCompiler
Expand Down