diff --git a/app/build.gradle b/app/build.gradle index 3a3d0905..c3772b1a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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}" diff --git a/build.gradle b/build.gradle index c5148654..a2a4d98e 100644 --- a/build.gradle +++ b/build.gradle @@ -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" } diff --git a/common/build.gradle b/common/build.gradle index 33c78e74..d410d37b 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -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" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 38b5d62c..ed19f963 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/leanback/build.gradle b/leanback/build.gradle index 3e11ad59..b45a2031 100644 --- a/leanback/build.gradle +++ b/leanback/build.gradle @@ -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 diff --git a/leanback/src/main/java/de/nicidienase/chaosflix/leanback/detail/DetailsActivity.kt b/leanback/src/main/java/de/nicidienase/chaosflix/leanback/detail/DetailsActivity.kt index 72f47ad3..fa8c243d 100644 --- a/leanback/src/main/java/de/nicidienase/chaosflix/leanback/detail/DetailsActivity.kt +++ b/leanback/src/main/java/de/nicidienase/chaosflix/leanback/detail/DetailsActivity.kt @@ -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) } diff --git a/leanback/src/main/java/de/nicidienase/chaosflix/leanback/detail/EventDetailsFragment.kt b/leanback/src/main/java/de/nicidienase/chaosflix/leanback/detail/EventDetailsFragment.kt index d5219ffa..b51c2ed2 100644 --- a/leanback/src/main/java/de/nicidienase/chaosflix/leanback/detail/EventDetailsFragment.kt +++ b/leanback/src/main/java/de/nicidienase/chaosflix/leanback/detail/EventDetailsFragment.kt @@ -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() diff --git a/leanback/src/main/java/de/nicidienase/chaosflix/leanback/detail/StreamDetailsFragment.kt b/leanback/src/main/java/de/nicidienase/chaosflix/leanback/detail/StreamDetailsFragment.kt index 8e8d16b1..58b8fe3f 100644 --- a/leanback/src/main/java/de/nicidienase/chaosflix/leanback/detail/StreamDetailsFragment.kt +++ b/leanback/src/main/java/de/nicidienase/chaosflix/leanback/detail/StreamDetailsFragment.kt @@ -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) } diff --git a/touch/build.gradle b/touch/build.gradle index 9f91371c..ac27a3bb 100644 --- a/touch/build.gradle +++ b/touch/build.gradle @@ -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') {