Skip to content

Commit 08c6712

Browse files
committed
WIP
1 parent 71517be commit 08c6712

File tree

174 files changed

+1071
-809
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

174 files changed

+1071
-809
lines changed

.idea/codeStyles/Project.xml

Lines changed: 110 additions & 42 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/codeStyles/codeStyleConfig.xml

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app-youtube/build.gradle

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ android {
4747
targetSdkVersion rootProject.ext.androidVersion
4848
versionCode releaseVersionCode
4949
versionName "v" + releaseVersion
50-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
50+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
5151

5252
vectorDrawables.useSupportLibrary = true
5353
buildConfigField("String", "API_KEY", "\"${toro_youtube_apikey}\"")
@@ -97,16 +97,16 @@ dependencies {
9797
implementation fileTree(dir: 'libs', include: ['*.jar'])
9898
implementation project(':toro-core')
9999

100-
implementation "com.android.support:design:${rootProject.ext.supportLibraryVersion}"
101-
implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibraryVersion}"
102-
implementation "com.android.support:cardview-v7:${rootProject.ext.supportLibraryVersion}"
100+
implementation 'com.google.android.material:material:1.0.0'
101+
implementation 'androidx.appcompat:appcompat:1.0.2'
102+
implementation 'androidx.cardview:cardview:1.0.0'
103103

104104
implementation "com.google.apis:google-api-services-youtube:v3-rev209-${rootProject.ext.googleApiClient}"
105105
implementation "com.google.http-client:google-http-client-android:${rootProject.ext.googleApiClient}"
106106
implementation "com.google.api-client:google-api-client-android:${rootProject.ext.googleApiClient}"
107107
implementation "com.google.api-client:google-api-client-gson:${rootProject.ext.googleApiClient}"
108108

109-
implementation "android.arch.lifecycle:extensions:${rootProject.ext.archLibraryVersion}"
109+
implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
110110

111111
implementation "com.github.bumptech.glide:glide:${rootProject.ext.glide}"
112112
annotationProcessor "com.github.bumptech.glide:compiler:${rootProject.ext.glide}"
@@ -120,10 +120,6 @@ dependencies {
120120

121121
// implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
122122

123-
testImplementation 'junit:junit:4.12'
124-
// androidTestImplementation 'com.android.support.test:runner:1.0.1'
125-
// androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
126-
127123
implementation('com.crashlytics.sdk.android:crashlytics:2.9.7@aar') {
128124
transitive = true
129125
}
@@ -138,6 +134,13 @@ dependencies {
138134
// implementation 'com.squareup.leakcanary:leaksentry:2.0-alpha-2'
139135

140136
// implementation "com.android.support:multidex:1.0.3"
137+
138+
testImplementation 'junit:junit:4.12'
139+
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
140+
androidTestImplementation 'androidx.test:core:1.2.0'
141+
androidTestImplementation 'androidx.test:rules:1.2.0'
142+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
143+
androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.2.0'
141144
}
142145

143146
if (haveFabricApiKey) {

0 commit comments

Comments
 (0)