Mirrors/chaosflix
2
0
Fork 0
mirror of https://github.com/NiciDieNase/chaosflix synced 2025-03-01 21:57:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into develop

Browse source
This commit is contained in:
Felix 2021-05-05 21:11:05 +02:00
commit dc1dbf28ba
9 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/build.gradle
View file

@ -12,7 +12,6 @@ String versionString = new File("versionfile").text.trim()
android {
compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion
defaultConfig {
applicationId "de.nicidienase.chaosflix"

7
build.gradle
View file

@ -9,7 +9,7 @@ buildscript {
maven { url "https://plugins.gradle.org/m2/" }
}
dependencies {
classpath 'com.android.tools.build:gradle:4.0.0'
classpath 'com.android.tools.build:gradle:4.0.2'
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"
@ -36,9 +36,8 @@ allprojects {
ext{
minSDK = 22
targetSDK = 28
compileSdkVersion = 28
buildToolsVersion = "28.0.3"
targetSDK = 29
compileSdkVersion = 29
supportLibraryVersion = "28.0.0"
constraintLayoutVersion = "1.1.3"
}

3
common/build.gradle
View file

@ -7,7 +7,6 @@ plugins {
android {
compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion
defaultConfig {
minSdkVersion rootProject.ext.minSDK
@ -109,7 +108,7 @@ dependencies {
testImplementation "io.mockk:mockk:1.9.3"
testImplementation 'org.robolectric:robolectric:4.1'
testImplementation 'org.robolectric:robolectric:4.5.1'
androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
exclude group: 'com.android.support', module: 'support-annotations'
})

2
common/src/main/java/de/nicidienase/chaosflix/common/mediadata/entities/streaming/Room.kt
View file

@ -25,7 +25,7 @@ data class Room(
link = input.readString() ?: "",
display = input.readString() ?: "",
talks = readMap(input),
streams = input.createTypedArrayList<Stream>(Stream.CREATOR).filterNotNull())
streams = input.createTypedArrayList<Stream>(Stream.CREATOR)?.filterNotNull() ?: emptyList())
override fun describeContents(): Int {
return 0

1
common/src/main/java/de/nicidienase/chaosflix/common/util/ConferenceUtil.kt
View file

@ -29,6 +29,7 @@ object ConferenceUtil {
@JvmStatic
val orderedConferencesList: List<String> = listOf(
"congress",
"divoc",
"gpn",
"mrmcd",
"broadcast/chaosradio",

5
common/src/test/java/de/nicidienase/chaosflix/common/ParcelableTest.kt
View file

@ -1,5 +1,6 @@
package de.nicidienase.chaosflix.common
import android.os.Build
import android.os.Parcel
import android.os.Parcelable
import de.nicidienase.chaosflix.common.mediadata.entities.recording.RelatedEventDto
@ -17,8 +18,10 @@ import org.junit.Assert.assertTrue
import org.junit.Test
import org.junit.runner.RunWith
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
@RunWith(RobolectricTestRunner::class)
@Config(sdk = [Build.VERSION_CODES.P])
class ParcelableTest {
@Test
@ -27,7 +30,7 @@ class ParcelableTest {
42,
"GPN42",
"16:9",
"Gulaschprogramiernach 42",
"Gulaschprogrammiernacht 42",
"GPN42",
"http://example/com",
"http://example/com",

3
leanback/build.gradle
View file

@ -8,7 +8,6 @@ plugins {
android {
buildToolsVersion '27.0.3'
compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion
defaultConfig {
minSdkVersion rootProject.ext.minSDK
targetSdkVersion rootProject.ext.targetSDK
@ -43,8 +42,6 @@ android {
buildFeatures {
dataBinding = true
}
buildToolsVersion rootProject.ext.buildToolsVersion
}
dependencies {

2
touch/build.gradle
View file

@ -7,9 +7,7 @@ plugins {
}
android {
compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion
defaultConfig {
minSdkVersion rootProject.ext.minSDK

3
touch/src/test/java/de/nicidienase/chaosflix/touch/ParcelableTest.kt
View file

@ -1,5 +1,6 @@
package de.nicidienase.chaosflix.touch
import android.os.Build
import android.os.Parcel
import android.os.Parcelable
import de.nicidienase.chaosflix.touch.playback.PlaybackItem
@ -7,8 +8,10 @@ import org.junit.Assert.assertTrue
import org.junit.Test
import org.junit.runner.RunWith
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
@RunWith(RobolectricTestRunner::class)
@Config(sdk = [Build.VERSION_CODES.P])
class ParcelableTest {
@Test