Mirrors/chaosflix
2
0
Fork 0
mirror of https://github.com/NiciDieNase/chaosflix synced 2025-02-16 21:18:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

cleanup dependencies

Browse source
This commit is contained in:
Felix Bürkle 2018-12-10 01:27:02 +01:00
parent f4c3cc59cf
commit 5cdb5429b2
6 changed files with 23 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build.gradle
View file

@ -31,8 +31,8 @@ ext{
targetSDK = 28
compileSdkVersion = 28
buildToolsVersion = "28.0.3"
supportLibraryVersion = "28.0.0"
constraintLayoutVersion = "1.0.2"
supportLibraryVersion = "27.1.1"
constraintLayoutVersion = "1.1.3"
archCompVersion = "1.1.1"
}

21
common/build.gradle
View file

@ -41,7 +41,7 @@ android {
group="de.nicidienase.chaosflix"
dependencies {
api "com.android.support:appcompat-v7:${rootProject.ext.supportLibraryVersion}"
// implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibraryVersion}"
api "android.arch.lifecycle:extensions:${rootProject.ext.archCompVersion}"
kapt "android.arch.lifecycle:compiler:${rootProject.ext.archCompVersion}"
@ -50,22 +50,27 @@ dependencies {
api "android.arch.persistence.room:runtime:${rootProject.ext.archCompVersion}"
kapt "android.arch.persistence.room:compiler:${rootProject.ext.archCompVersion}"
api 'com.squareup.retrofit2:retrofit:2.3.0'
api 'com.squareup.retrofit2:converter-gson:2.3.0'
api 'com.google.android.exoplayer:exoplayer:2.7.0'
api 'com.fasterxml.jackson.module:jackson-module-kotlin:2.9.0'
implementation 'com.squareup.retrofit2:retrofit:2.3.0'
implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.9.0'
debugApi 'com.facebook.stetho:stetho:1.4.2'
debugApi 'com.facebook.stetho:stetho-okhttp3:1.4.2'
debugApi 'com.facebook.stetho:stetho-okhttp:1.4.2'
api "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
api 'commons-io:commons-io:2.4'
debugImplementation 'com.facebook.stetho:stetho:1.4.2'
debugImplementation 'com.facebook.stetho:stetho-okhttp3:1.4.2'
debugImplementation 'com.facebook.stetho:stetho-okhttp:1.4.2'
testImplementation "org.mockito:mockito-core:2.11.0"
testImplementation 'junit:junit:4.12'
androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.1', {
exclude group: 'com.android.support', module: 'support-annotations'
})
api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
}
repositories {

4
leanback/build.gradle
View file

@ -61,9 +61,6 @@ dependencies {
implementation "com.android.support:preference-leanback-v17:${rootProject.ext.supportLibraryVersion}"
implementation "com.android.support:recyclerview-v7:${rootProject.ext.supportLibraryVersion}"
implementation "org.jetbrains.kotlin:kotlin-reflect:1.2.71"
implementation 'com.google.android.exoplayer:exoplayer:2.7.0'
implementation 'com.google.android.exoplayer:extension-leanback:2.6.1'
implementation 'com.github.bumptech.glide:glide:4.6.1'
@ -78,5 +75,4 @@ dependencies {
androidTestImplementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.3'
androidTestImplementation 'org.hamcrest:hamcrest-library:1.3'
androidTestImplementation 'com.squareup.okhttp3:mockwebserver:3.6.0'
androidTestImplementation group: 'commons-io', name: 'commons-io', version: '2.4'
}

12
leanback/src/main/java/de/nicidienase/chaosflix/leanback/activities/EventsActivity.kt
View file

@ -1,15 +1,9 @@
package de.nicidienase.chaosflix.leanback.activities
import android.arch.lifecycle.ViewModelProviders
import android.content.Context
import android.content.Intent
import android.os.Bundle
import android.support.v17.leanback.widget.ImageCardView
import android.support.v4.app.ActivityOptionsCompat
import android.support.v4.app.FragmentActivity
import android.support.v7.app.AppCompatActivity
import android.view.WindowManager
import de.nicidienase.chaosflix.R
import de.nicidienase.chaosflix.common.mediadata.entities.recording.persistence.PersistentConference
@ -18,7 +12,7 @@ class EventsActivity : FragmentActivity() {
public override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
val conference = intent.getParcelableExtra<PersistentConference>(CONFERENCE)
if(conference.tagsUsefull){
if (conference.tagsUsefull) {
// TODO determin if we should use a Browse or a Grid layout
}
setContentView(R.layout.activity_events_browse)
@ -32,10 +26,10 @@ class EventsActivity : FragmentActivity() {
@JvmStatic
@JvmOverloads
fun start(context: Context ,conference: PersistentConference, transition: Bundle? = null){
fun start(context: Context, conference: PersistentConference, transition: Bundle? = null) {
val i = Intent(context, EventsActivity::class.java)
i.putExtra(EventsActivity.CONFERENCE, conference)
if(transition != null){
if (transition != null) {
context.startActivity(i, transition)
} else {
context.startActivity(i)

18
touch/build.gradle
View file

@ -59,32 +59,23 @@ dependencies {
transitive = true
}
implementation 'com.github.medyo:android-about-page:1.2.2'
implementation 'com.android.support:multidex:1.0.3'
implementation "com.android.support:support-v4:${rootProject.ext.supportLibraryVersion}"
implementation "com.android.support:recyclerview-v7:${rootProject.ext.supportLibraryVersion}"
implementation "com.android.support:cardview-v7:${rootProject.ext.supportLibraryVersion}"
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
implementation "com.android.support.constraint:constraint-layout:${rootProject.ext.constraintLayoutVersion}"
implementation "com.android.support:design:${rootProject.ext.supportLibraryVersion}"
implementation "com.android.support:preference-v14:${rootProject.ext.supportLibraryVersion}"
implementation "android.arch.lifecycle:extensions:${rootProject.ext.archCompVersion}"
implementation "android.arch.lifecycle:common-java8:1.1.1"
implementation "android.arch.persistence.room:runtime:${rootProject.ext.archCompVersion}"
kapt "android.arch.lifecycle:compiler:${rootProject.ext.archCompVersion}"
implementation "org.jetbrains.kotlin:kotlin-reflect:1.2.71"
implementation 'com.squareup.retrofit2:retrofit:2.3.0'
implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.9.0'
implementation 'com.google.android.exoplayer:exoplayer:2.7.0'
implementation 'com.squareup.picasso:picasso:2.5.2'
implementation 'net.opacapp:multiline-collapsingtoolbar:1.6.0'
implementation 'net.opacapp:multiline-collapsingtoolbar:27.1.0'
implementation 'net.rdrei.android.dirchooser:library:3.2@aar'
implementation 'com.gu:option:1.3'
testImplementation 'org.mockito:mockito-core:2.11.0'
androidTestImplementation('com.android.support.test:rules:0.5') {
exclude module: 'support-annotations'
}
@ -93,12 +84,9 @@ dependencies {
}
androidTestImplementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.3'
androidTestImplementation 'org.hamcrest:hamcrest-library:1.3'
testImplementation 'org.mockito:mockito-core:2.11.0'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
}
implementation 'commons-io:commons-io:2.4'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
}
kapt {

4
touch/src/main/java/de/nicidienase/chaosflix/touch/about/AboutActivity.kt
View file

@ -18,8 +18,8 @@ class AboutActivity : AppCompatActivity() {
val binding = DataBindingUtil.setContentView<ActivityAboutBinding>(
this, R.layout.activity_about)
binding.toolbarInc?.toolbar?.title = getString(R.string.about_chaosflix)
setSupportActionBar(binding.toolbarInc?.toolbar)
binding.toolbarInc.toolbar.title = getString(R.string.about_chaosflix)
setSupportActionBar(binding.toolbarInc.toolbar)
supportActionBar?.setDisplayHomeAsUpEnabled(true)
val showLibs = Element()