Mirrors/chaosflix
2
0
Fork 0
mirror of https://github.com/NiciDieNase/chaosflix synced 2024-12-11 05:12:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

update dependencies and versions to fix build

Browse source
This commit is contained in:
Felix 2021-05-06 09:00:15 +02:00
parent 7f8c8e4978
commit c0257e76c2
9 changed files with 30 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/build.gradle
View file

@ -2,7 +2,7 @@ plugins {
id 'com.android.application'
id 'kotlin-android'
id 'kotlin-kapt'
id 'kotlin-android-extensions'
id 'kotlin-parcelize'
id 'com.github.triplet.play' version '2.6.2'
}
@ -149,7 +149,7 @@ dependencies {
implementation project(':leanback')
implementation project(':common')
noFreeImplementation 'com.google.android.gms:play-services-cast-framework:19.0.0'
noFreeImplementation 'com.google.android.gms:play-services-cast-framework:20.0.0'
def appCenterSdkVersion = '2.5.1'
noFreeImplementation "com.microsoft.appcenter:appcenter-analytics:${appCenterSdkVersion}"

15
build.gradle
View file

@ -1,20 +1,22 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.kotlin_version = '1.3.72'
ext.kotlin_version = '1.4.21'
repositories {
mavenLocal()
google()
jcenter()
maven { url "https://plugins.gradle.org/m2/" }
maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
maven { url 'https://jitpack.io' }
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.0.2'
classpath 'com.android.tools.build:gradle:4.2.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jlleitschuh.gradle:ktlint-gradle:9.1.1"
def nav_version = "2.3.0-alpha03"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
classpath "de.mannodermaus.gradle.plugins:android-junit5:1.6.0.0"
classpath "de.mannodermaus.gradle.plugins:android-junit5:1.7.1.1"
classpath "org.koin:koin-gradle-plugin:2.1.6"
@ -27,9 +29,10 @@ allprojects {
repositories {
mavenLocal()
google()
jcenter()
maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
maven { url "https://plugins.gradle.org/m2/" }
maven { url 'https://jitpack.io' }
mavenCentral()
}
}
@ -38,7 +41,7 @@ ext{
minSDK = 22
targetSDK = 29
compileSdkVersion = 29
supportLibraryVersion = "28.0.0"
supportLibraryVersion = "30.0.2"
constraintLayoutVersion = "1.1.3"
}

8
common/build.gradle
View file

@ -61,7 +61,7 @@ dependencies {
api "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
api 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0'
api 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7'
api 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0'
api 'androidx.appcompat:appcompat:1.2.0'
@ -72,14 +72,14 @@ dependencies {
api "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
api "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
api "androidx.core:core-ktx:1.3.1"
api "androidx.core:core-ktx:1.3.2"
def paging_version = "2.1.2"
api "androidx.paging:paging-runtime-ktx:$paging_version"
api "androidx.recyclerview:recyclerview:1.2.0-alpha05"
api "androidx.recyclerview:recyclerview:1.2.0"
def roomVersion = "2.2.5"
def roomVersion = "2.3.0"
api "androidx.room:room-runtime:$roomVersion"
kapt "androidx.room:room-compiler:$roomVersion"
api "androidx.room:room-ktx:$roomVersion"

2
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
distributionSha256Sum=10065868c78f1207afb3a92176f99a37d753a513dff453abb6b5cceda4058cda

3
leanback/build.gradle
View file

@ -2,11 +2,10 @@ plugins {
id 'com.android.library'
id 'kotlin-android'
id 'kotlin-kapt'
id 'kotlin-android-extensions'
id 'kotlin-parcelize'
}
android {
buildToolsVersion '27.0.3'
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
minSdkVersion rootProject.ext.minSDK

2
leanback/src/main/java/de/nicidienase/chaosflix/leanback/detail/DetailsActivity.kt
View file

@ -24,7 +24,7 @@ class DetailsActivity : androidx.fragment.app.FragmentActivity() {
setContentView(R.layout.activity_event_details)
lifecycleScope.launch {
val fragment = if (intent.action == Intent.ACTION_VIEW) {
val guid = intent.data.lastPathSegment
val guid = intent.data?.lastPathSegment
EventDetailsFragment().apply {
arguments = bundleOf(EventDetailsFragment.ARG_EVENT_GUID to guid)
}

4
leanback/src/main/java/de/nicidienase/chaosflix/leanback/detail/EventDetailsFragment.kt
View file

@ -80,12 +80,12 @@ class EventDetailsFragment : DetailsSupportFragment() {
private val playerDelegate = lazy {
ExoPlayerFactory.newSimpleInstance(
activity,
requireContext(),
DefaultTrackSelector(
AdaptiveTrackSelection.Factory()))
}
private val player: SimpleExoPlayer by playerDelegate
private val playerAdapter: LeanbackPlayerAdapter by lazy { LeanbackPlayerAdapter(context, player, 16) }
private val playerAdapter: LeanbackPlayerAdapter by lazy { LeanbackPlayerAdapter(requireContext(), player, 16) }
private val playerGlue: ChaosMediaPlayerGlue by lazy {
ChaosMediaPlayerGlue(requireContext(), playerAdapter) {
detailsViewModel.createBookmark()

4
leanback/src/main/java/de/nicidienase/chaosflix/leanback/detail/StreamDetailsFragment.kt
View file

@ -71,7 +71,7 @@ class StreamDetailsFragment : DetailsSupportFragment() {
private val playerDelegate = lazy {
ExoPlayerFactory.newSimpleInstance(
activity,
requireContext(),
DefaultTrackSelector(
AdaptiveTrackSelection.Factory()))
}
@ -223,7 +223,7 @@ class StreamDetailsFragment : DetailsSupportFragment() {
}
private fun buildPlayerGlue(): ChaosMediaPlayerGlue {
playerAdapter = LeanbackPlayerAdapter(context, player, 16)
playerAdapter = LeanbackPlayerAdapter(requireContext(), player, 16)
return ChaosMediaPlayerGlue(requireContext(), playerAdapter)
}

16
touch/build.gradle
View file

@ -2,7 +2,7 @@ plugins {
id 'com.android.library'
id 'kotlin-android'
id 'kotlin-kapt'
id 'kotlin-android-extensions'
id 'kotlin-parcelize'
id "androidx.navigation.safeargs.kotlin"
}
@ -64,7 +64,7 @@ dependencies {
implementation('com.mikepenz:aboutlibraries:6.1.1@aar') {
transitive = true
}
def nav_version = "2.3.0"
def nav_version = "2.3.5"
implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
@ -72,14 +72,14 @@ dependencies {
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
implementation 'androidx.navigation:navigation-fragment-ktx:2.3.0'
implementation 'androidx.navigation:navigation-ui-ktx:2.3.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5'
implementation 'androidx.navigation:navigation-ui-ktx:2.3.5'
implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
implementation 'androidx.mediarouter:mediarouter:1.2.0'
implementation 'com.google.android.material:material:1.3.0-alpha02'
implementation 'androidx.mediarouter:mediarouter:1.2.2'
implementation 'com.google.android.material:material:1.3.0'
implementation "androidx.browser:browser:1.2.0"
implementation "androidx.browser:browser:1.3.0"
implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.9.0'
implementation('com.mikepenz:aboutlibraries:6.1.1@aar') {