mirrors/vlc-android
0
0
Fork 0
mirror of https://github.com/videolan/vlc-android synced 2024-11-23 18:05:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove kotlin-android-extensions plugin and update gradle dependencies

Browse Source 
Fixes #2467
This commit is contained in:
Robert Stone 2022-04-07 23:15:04 -07:00 committed by Nicolas Pomepuy
parent b3f6ee97fe
commit b46ad3cc98
14 changed files with 17 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
application/app/build.gradle
View File

@ -1,6 +1,5 @@
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
apply plugin: 'kotlin-android' apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
android { android {
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8
@ -19,13 +18,6 @@ android {
} }
} }
dexOptions {
maxProcessCount 8
javaMaxHeapSize "4g"
preDexLibraries true
}
dataBinding { dataBinding {
enabled = true enabled = true
} }
@ -156,7 +148,7 @@ dependencies {
androidTestImplementation "androidx.room:room-testing:$rootProject.ext.roomVersion" androidTestImplementation "androidx.room:room-testing:$rootProject.ext.roomVersion"
testImplementation "androidx.arch.core:core-testing:$rootProject.ext.archVersion" testImplementation "androidx.arch.core:core-testing:$rootProject.ext.archVersion"
androidTestImplementation "androidx.arch.core:core-testing:$rootProject.ext.archVersion" androidTestImplementation "androidx.arch.core:core-testing:$rootProject.ext.archVersion"
androidTestImplementation "androidx.test.ext:junit:$rootProject.ext.supportTest" androidTestImplementation "androidx.test.ext:junit:$rootProject.ext.junitExtVersion"
androidTestUtil "androidx.test:orchestrator:$rootProject.ext.orchestrator" androidTestUtil "androidx.test:orchestrator:$rootProject.ext.orchestrator"
testImplementation "androidx.test:core:$rootProject.ext.testCore" testImplementation "androidx.test:core:$rootProject.ext.testCore"
testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$rootProject.ext.kotlinx_version" testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$rootProject.ext.kotlinx_version"

3
application/donations/build.gradle
View File

@ -24,7 +24,6 @@
apply plugin: 'com.android.library' apply plugin: 'com.android.library'
apply plugin: 'kotlin-android' apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
android { android {
compileSdkVersion rootProject.ext.compileSdkVersion compileSdkVersion rootProject.ext.compileSdkVersion
@ -75,7 +74,7 @@ dependencies {
implementation "androidx.core:core-ktx:$rootProject.ext.androidxCoreVersion" implementation "androidx.core:core-ktx:$rootProject.ext.androidxCoreVersion"
implementation "androidx.appcompat:appcompat:$rootProject.ext.appCompatVersion" implementation "androidx.appcompat:appcompat:$rootProject.ext.appCompatVersion"
testImplementation "junit:junit:$rootProject.ext.junitVersion" testImplementation "junit:junit:$rootProject.ext.junitVersion"
androidTestImplementation "androidx.test.ext:junit:$rootProject.ext.junitVersion" androidTestImplementation "androidx.test.ext:junit:$rootProject.ext.junitExtVersion"
androidTestImplementation "androidx.test.espresso:espresso-core:$rootProject.ext.espressoVersion" androidTestImplementation "androidx.test.espresso:espresso-core:$rootProject.ext.espressoVersion"
} }

3
application/live-plot-graph/build.gradle
View File

@ -24,7 +24,6 @@
apply plugin: 'com.android.library' apply plugin: 'com.android.library'
apply plugin: 'kotlin-android' apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
android { android {
compileSdkVersion rootProject.ext.compileSdkVersion compileSdkVersion rootProject.ext.compileSdkVersion
@ -54,6 +53,6 @@ dependencies {
implementation "androidx.constraintlayout:constraintlayout:$rootProject.ext.constraintLayoutVersion" implementation "androidx.constraintlayout:constraintlayout:$rootProject.ext.constraintLayoutVersion"
testImplementation "junit:junit:$rootProject.ext.junitVersion" testImplementation "junit:junit:$rootProject.ext.junitVersion"
androidTestImplementation "androidx.test.ext:junit:$rootProject.ext.junitVersion" androidTestImplementation "androidx.test.ext:junit:$rootProject.ext.junitExtVersion"
androidTestImplementation "androidx.test.espresso:espresso-core:$rootProject.ext.espressoVersion" androidTestImplementation "androidx.test.espresso:espresso-core:$rootProject.ext.espressoVersion"
} }

2
application/mediadb/build.gradle
View File

@ -63,7 +63,7 @@ dependencies {
implementation "androidx.appcompat:appcompat:$rootProject.ext.appCompatVersion" implementation "androidx.appcompat:appcompat:$rootProject.ext.appCompatVersion"
implementation "androidx.core:core-ktx:$rootProject.ext.androidxCoreVersion" implementation "androidx.core:core-ktx:$rootProject.ext.androidxCoreVersion"
testImplementation "junit:junit:$rootProject.ext.junitVersion" testImplementation "junit:junit:$rootProject.ext.junitVersion"
androidTestImplementation "androidx.test.ext:junit:$rootProject.ext.junitVersion" androidTestImplementation "androidx.test.ext:junit:$rootProject.ext.junitExtVersion"
androidTestImplementation "androidx.test.espresso:espresso-core:$rootProject.ext.espressoVersion" androidTestImplementation "androidx.test.espresso:espresso-core:$rootProject.ext.espressoVersion"
//Room //Room
implementation "androidx.room:room-ktx:$rootProject.ext.roomVersion" implementation "androidx.room:room-ktx:$rootProject.ext.roomVersion"

3
application/moviepedia/build.gradle
View File

@ -1,7 +1,6 @@
apply plugin: 'com.android.library' apply plugin: 'com.android.library'
apply plugin: 'kotlin-android' apply plugin: 'kotlin-android'
apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-kapt'
apply plugin: 'kotlin-android-extensions'
android { android {
compileSdkVersion rootProject.ext.compileSdkVersion compileSdkVersion rootProject.ext.compileSdkVersion
@ -69,7 +68,7 @@ dependencies {
implementation("com.squareup.okhttp3:logging-interceptor:4.2.1") implementation("com.squareup.okhttp3:logging-interceptor:4.2.1")
testImplementation "junit:junit:$rootProject.ext.junitVersion" testImplementation "junit:junit:$rootProject.ext.junitVersion"
androidTestImplementation "androidx.test.ext:junit:$rootProject.ext.junitVersion" androidTestImplementation "androidx.test.ext:junit:$rootProject.ext.junitExtVersion"
androidTestImplementation "androidx.test.espresso:espresso-core:$rootProject.ext.espressoVersion" androidTestImplementation "androidx.test.espresso:espresso-core:$rootProject.ext.espressoVersion"
} }

3
application/resources/build.gradle
View File

@ -1,6 +1,5 @@
apply plugin: 'com.android.library' apply plugin: 'com.android.library'
apply plugin: 'kotlin-android' apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
android { android {
compileSdkVersion rootProject.ext.compileSdkVersion compileSdkVersion rootProject.ext.compileSdkVersion
@ -73,7 +72,7 @@ dependencies {
api "androidx.core:core-ktx:$rootProject.ext.androidxCoreVersion" api "androidx.core:core-ktx:$rootProject.ext.androidxCoreVersion"
testImplementation "androidx.test:core:$rootProject.ext.testCore" testImplementation "androidx.test:core:$rootProject.ext.testCore"
androidTestImplementation "androidx.test.ext:junit:$rootProject.ext.supportTest" androidTestImplementation "androidx.test.ext:junit:$rootProject.ext.junitExtVersion"
} }
repositories { repositories {
mavenCentral() mavenCentral()

9
application/television/build.gradle
View File

@ -1,7 +1,7 @@
apply plugin: 'com.android.library' apply plugin: 'com.android.library'
apply plugin: 'kotlin-android' apply plugin: 'kotlin-android'
apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-kapt'
apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-parcelize'
android { android {
compileSdkVersion rootProject.ext.compileSdkVersion compileSdkVersion rootProject.ext.compileSdkVersion
packagingOptions { packagingOptions {
@ -10,11 +10,6 @@ android {
} }
} }
androidExtensions {
features = ["parcelize"]
}
kotlinOptions.jvmTarget = "1.8" kotlinOptions.jvmTarget = "1.8"
viewBinding.enabled = true viewBinding.enabled = true
@ -46,5 +41,5 @@ dependencies {
implementation project(':application:vlc-android') implementation project(':application:vlc-android')
api project(':application:moviepedia') api project(':application:moviepedia')
testImplementation "androidx.test:core:$rootProject.ext.testCore" testImplementation "androidx.test:core:$rootProject.ext.testCore"
androidTestImplementation "androidx.test.ext:junit:$rootProject.ext.supportTest" androidTestImplementation "androidx.test.ext:junit:$rootProject.ext.junitExtVersion"
} }

3
application/television/src/main/java/org/videolan/television/ui/MediaItemDetails.kt
View File

@ -20,9 +20,8 @@
*/ */
package org.videolan.television.ui package org.videolan.television.ui
import android.os.Parcel
import android.os.Parcelable import android.os.Parcelable
import kotlinx.android.parcel.Parcelize import kotlinx.parcelize.Parcelize
@Parcelize @Parcelize
data class MediaItemDetails(var title: String? = null, var subTitle: String? = null, data class MediaItemDetails(var title: String? = null, var subTitle: String? = null,

2
application/tools/build.gradle
View File

@ -33,6 +33,6 @@ dependencies {
implementation "androidx.core:core-ktx:$rootProject.ext.androidxCoreVersion" implementation "androidx.core:core-ktx:$rootProject.ext.androidxCoreVersion"
testImplementation "junit:junit:$rootProject.ext.junitVersion" testImplementation "junit:junit:$rootProject.ext.junitVersion"
androidTestImplementation "androidx.test:runner:$rootProject.ext.supportTest" androidTestImplementation "androidx.test:runner:$rootProject.ext.testRunner"
androidTestImplementation "androidx.test.espresso:espresso-core:$rootProject.espressoVersion" androidTestImplementation "androidx.test.espresso:espresso-core:$rootProject.espressoVersion"
} }

4
application/vlc-android/build.gradle
View File

@ -1,7 +1,7 @@
apply plugin: 'com.android.library' apply plugin: 'com.android.library'
apply plugin: 'kotlin-android' apply plugin: 'kotlin-android'
apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-kapt'
apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-parcelize'
android { android {
@ -204,7 +204,7 @@ dependencies {
androidTestImplementation "androidx.room:room-testing:$rootProject.ext.roomVersion" androidTestImplementation "androidx.room:room-testing:$rootProject.ext.roomVersion"
testImplementation "androidx.arch.core:core-testing:$rootProject.ext.archVersion" testImplementation "androidx.arch.core:core-testing:$rootProject.ext.archVersion"
androidTestImplementation "androidx.arch.core:core-testing:$rootProject.ext.archVersion" androidTestImplementation "androidx.arch.core:core-testing:$rootProject.ext.archVersion"
androidTestImplementation "androidx.test.ext:junit:$rootProject.ext.supportTest" androidTestImplementation "androidx.test.ext:junit:$rootProject.ext.junitExtVersion"
androidTestUtil "androidx.test:orchestrator:$rootProject.ext.orchestrator" androidTestUtil "androidx.test:orchestrator:$rootProject.ext.orchestrator"
testImplementation "androidx.test:core:$rootProject.ext.testCore" testImplementation "androidx.test:core:$rootProject.ext.testCore"
testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$rootProject.ext.kotlinx_version" testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$rootProject.ext.kotlinx_version"

2
application/vlc-android/src/org/videolan/vlc/gui/LibrariesActivity.kt
View File

@ -10,7 +10,7 @@ import androidx.lifecycle.*
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import com.google.android.material.appbar.MaterialToolbar import com.google.android.material.appbar.MaterialToolbar
import com.squareup.moshi.* import com.squareup.moshi.*
import kotlinx.android.parcel.Parcelize import kotlinx.parcelize.Parcelize
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.ObsoleteCoroutinesApi import kotlinx.coroutines.ObsoleteCoroutinesApi

2
application/vlc-android/src/org/videolan/vlc/gui/helpers/SparseBooleanArrayParcelable.kt
View File

@ -2,7 +2,7 @@ package org.videolan.vlc.gui.helpers
import android.os.Parcelable import android.os.Parcelable
import android.util.SparseBooleanArray import android.util.SparseBooleanArray
import kotlinx.android.parcel.Parcelize import kotlinx.parcelize.Parcelize
@Parcelize @Parcelize
class SparseBooleanArrayParcelable(val data: SparseBooleanArray) : Parcelable class SparseBooleanArrayParcelable(val data: SparseBooleanArray) : Parcelable

2
application/vlc-android/src/org/videolan/vlc/gui/preferences/search/PreferenceParser.kt
View File

@ -30,7 +30,7 @@ import android.content.SharedPreferences
import android.content.res.XmlResourceParser import android.content.res.XmlResourceParser
import android.os.Parcelable import android.os.Parcelable
import androidx.annotation.XmlRes import androidx.annotation.XmlRes
import kotlinx.android.parcel.Parcelize import kotlinx.parcelize.Parcelize
import org.videolan.tools.Settings import org.videolan.tools.Settings
import org.videolan.tools.wrap import org.videolan.tools.wrap
import org.videolan.vlc.R import org.videolan.vlc.R

3
build.gradle
View File

@ -58,6 +58,7 @@ ext {
roomVersion = '2.4.1' roomVersion = '2.4.1'
pagingVersion = '3.1.0' pagingVersion = '3.1.0'
junitVersion = '4.13.2' junitVersion = '4.13.2'
junitExtVersion = '1.1.2'
mockito = '2.25.0' mockito = '2.25.0'
//Retrofit 2.7 drops Android 5 support //Retrofit 2.7 drops Android 5 support
retrofit = '2.7.1' retrofit = '2.7.1'
@ -67,7 +68,7 @@ ext {
livedataTest = '1.2.0' livedataTest = '1.2.0'
robolectric = '4.3.1' robolectric = '4.3.1'
mockk = '1.9.3' mockk = '1.9.3'
supportTest = '1.1.3' testRunner = '1.4.0'
orchestrator = '1.1.0' orchestrator = '1.1.0'
testCore = '1.4.0' testCore = '1.4.0'
// versionCode scheme is T M NN RR AA // versionCode scheme is T M NN RR AA