mirror of
https://github.com/mediathekview/zapp.git
synced 2024-09-19 20:02:17 +02:00
Update outdated libraries
This commit is contained in:
Christine Emrich
parent
9906ae90fd
commit
4d9aa40f10
@ -1,23 +1,38 @@
|
||||
<component name="ProjectCodeStyleConfiguration">
|
||||
<code_scheme name="Project" version="173">
|
||||
<option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
|
||||
<option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
|
||||
<option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
|
||||
<value />
|
||||
</option>
|
||||
<option name="IMPORT_LAYOUT_TABLE">
|
||||
<value>
|
||||
<package name="android" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="com" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="junit" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="net" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="org" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="java" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="javax" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="" withSubpackages="true" static="true" />
|
||||
<emptyLine />
|
||||
</value>
|
||||
</option>
|
||||
<JetCodeStyleSettings>
|
||||
<option name="PACKAGES_TO_USE_STAR_IMPORTS">
|
||||
<value>
|
||||
<package name="java.util" alias="false" withSubpackages="false" />
|
||||
<package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
|
||||
<package name="io.ktor" alias="false" withSubpackages="true" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="PACKAGES_IMPORT_LAYOUT">
|
||||
<value>
|
||||
<package name="" alias="false" withSubpackages="true" />
|
||||
<package name="java" alias="false" withSubpackages="true" />
|
||||
<package name="javax" alias="false" withSubpackages="true" />
|
||||
<package name="kotlin" alias="false" withSubpackages="true" />
|
||||
<package name="" alias="true" withSubpackages="true" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
|
||||
</JetCodeStyleSettings>
|
||||
<XML>
|
||||
<option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
|
||||
</XML>
|
||||
<codeStyleSettings language="XML">
|
||||
<indentOptions>
|
||||
<option name="CONTINUATION_INDENT_SIZE" value="4" />
|
||||
@ -130,5 +145,8 @@
|
||||
</rules>
|
||||
</arrangement>
|
||||
</codeStyleSettings>
|
||||
<codeStyleSettings language="kotlin">
|
||||
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
|
||||
</codeStyleSettings>
|
||||
</code_scheme>
|
||||
</component>
|
||||
5
.idea/codeStyles/codeStyleConfig.xml
Normal file
5
.idea/codeStyles/codeStyleConfig.xml
Normal file
@ -0,0 +1,5 @@
|
||||
<component name="ProjectCodeStyleConfiguration">
|
||||
<state>
|
||||
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
|
||||
</state>
|
||||
</component>
|
||||
@ -98,7 +98,7 @@ dependencies {
|
||||
// unit tests
|
||||
testImplementation 'androidx.test.ext:junit-ktx:1.1.2'
|
||||
testImplementation 'androidx.test:core-ktx:1.3.0'
|
||||
testImplementation 'org.robolectric:robolectric:4.4'
|
||||
testImplementation 'org.robolectric:robolectric:4.4.1'
|
||||
|
||||
// support
|
||||
implementation 'androidx.fragment:fragment-ktx:1.3.5'
|
||||
@ -121,8 +121,8 @@ dependencies {
|
||||
|
||||
|
||||
// helper
|
||||
implementation 'com.google.code.gson:gson:2.8.6'
|
||||
implementation 'commons-io:commons-io:2.8.0'
|
||||
implementation 'com.google.code.gson:gson:2.8.7'
|
||||
implementation 'commons-io:commons-io:2.10.0'
|
||||
|
||||
// sortable list
|
||||
implementation 'com.github.woxthebox:draglistview:1.7.2'
|
||||
@ -147,28 +147,29 @@ dependencies {
|
||||
implementation 'com.squareup.retrofit2:adapter-rxjava2:2.9.0'
|
||||
|
||||
// ACRA crash reporting
|
||||
implementation 'ch.acra:acra-mail:5.7.0'
|
||||
implementation 'ch.acra:acra-dialog:5.7.0'
|
||||
def acra_version = "5.8.3"
|
||||
implementation "ch.acra:acra-mail:$acra_version"
|
||||
implementation "ch.acra:acra-dialog:$acra_version"
|
||||
|
||||
// timber logging
|
||||
implementation 'com.jakewharton.timber:timber:4.7.1'
|
||||
|
||||
// joda time
|
||||
implementation 'joda-time:joda-time:2.10.9'
|
||||
implementation 'joda-time:joda-time:2.10.10'
|
||||
|
||||
// rxjava
|
||||
implementation 'io.reactivex.rxjava2:rxjava:2.2.20'
|
||||
implementation 'io.reactivex.rxjava2:rxjava:2.2.21'
|
||||
implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
|
||||
|
||||
// about libraries view
|
||||
implementation "com.mikepenz:aboutlibraries:$about_libraries_version"
|
||||
|
||||
// koin dependency injection
|
||||
implementation "org.koin:koin-androidx-scope:$koin_version"
|
||||
implementation "org.koin:koin-androidx-viewmodel:$koin_version"
|
||||
implementation "org.koin:koin-androidx-fragment:$koin_version"
|
||||
androidTestImplementation "org.koin:koin-test:$koin_version"
|
||||
testImplementation "org.koin:koin-test:$koin_version"
|
||||
implementation "io.insert-koin:koin-androidx-scope:$koin_version"
|
||||
implementation "io.insert-koin:koin-androidx-viewmodel:$koin_version"
|
||||
implementation "io.insert-koin:koin-androidx-fragment:$koin_version"
|
||||
androidTestImplementation "io.insert-koin:koin-test:$koin_version"
|
||||
testImplementation "io.insert-koin:koin-test:$koin_version"
|
||||
|
||||
implementation 'org.jetbrains:annotations-java5:20.1.0'
|
||||
implementation 'org.jetbrains:annotations-java5:21.0.1'
|
||||
}
|
||||
|
||||
@ -81,8 +81,8 @@ abstract class ZappApplicationBase : Application() {
|
||||
private lateinit var koin: Koin
|
||||
|
||||
fun reportError(throwable: Throwable?) {
|
||||
if (ACRA.isInitialised()) {
|
||||
ACRA.getErrorReporter().handleException(throwable)
|
||||
if (ACRA.isInitialised) {
|
||||
ACRA.errorReporter.handleException(throwable)
|
||||
}
|
||||
|
||||
Timber.e(throwable)
|
||||
|
||||
@ -121,7 +121,7 @@ class MainActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
|
||||
private fun handleIntent(intent: Intent) {
|
||||
if (Intent.ACTION_SEARCH == intent.action) {
|
||||
// called by searchView on search commit
|
||||
val query = intent.getStringExtra(SearchManager.QUERY)
|
||||
val query = intent.getStringExtra(SearchManager.QUERY) ?: ""
|
||||
|
||||
binding.search.setOnQueryTextListener(null)
|
||||
binding.search.clearFocus()
|
||||
|
||||
@ -1,15 +1,16 @@
|
||||
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||
|
||||
buildscript {
|
||||
ext.koin_version = '2.2.2'
|
||||
ext.about_libraries_version = '8.6.5'
|
||||
ext.koin_version = '2.2.3'
|
||||
ext.about_libraries_version = '8.9.0'
|
||||
|
||||
repositories {
|
||||
google()
|
||||
jcenter()
|
||||
mavenCentral()
|
||||
maven {
|
||||
url "https://plugins.gradle.org/m2/"
|
||||
}
|
||||
jcenter()
|
||||
}
|
||||
|
||||
dependencies {
|
||||
@ -19,7 +20,7 @@ buildscript {
|
||||
|
||||
classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$about_libraries_version"
|
||||
|
||||
classpath "org.koin:koin-gradle-plugin:$koin_version"
|
||||
classpath "io.insert-koin:koin-gradle-plugin:3.1.0"
|
||||
|
||||
// NOTE: Do not place your application dependencies here; they belong
|
||||
// in the individual module build.gradle files
|
||||
|
||||
Loading…
Reference in New Issue
Block a user