Update dependencies

parent 668b36af
......@@ -102,30 +102,32 @@ android {
}
dependencies {
implementation(kotlin("stdlib", "1.3.41"))
implementation(kotlin("stdlib", "1.3.50"))
// App Compat
implementation("com.google.android.material", "material", "1.1.0-alpha09")
implementation("com.google.android.material", "material", "1.1.0-alpha10")
implementation("androidx.appcompat", "appcompat", "1.0.2")
implementation("androidx.browser", "browser", "1.0.0")
implementation("androidx.appcompat", "appcompat", "1.1.0")
implementation("androidx.browser", "browser", "1.2.0-alpha07")
implementation("androidx.cardview", "cardview", "1.0.0")
implementation("androidx.recyclerview", "recyclerview", "1.0.0")
implementation("androidx.recyclerview", "recyclerview", "1.1.0-beta04")
implementation("androidx.swiperefreshlayout", "swiperefreshlayout", "1.1.0-alpha02")
implementation("androidx.preference", "preference", "1.0.0")
// Only needed for ringtone preference
implementation("androidx.legacy", "legacy-preference-v14", "1.0.0")
implementation("androidx.constraintlayout", "constraintlayout", "1.1.3")
implementation("androidx.constraintlayout", "constraintlayout", "2.0.0-beta1")
withVersion("2.1.0") {
withVersion("2.2.0-rc01") {
implementation("androidx.room", "room-runtime", version)
kapt("androidx.room", "room-compiler", version)
implementation("androidx.room", "room-rxjava2", version)
testImplementation("androidx.room", "room-testing", version)
}
withVersion("2.0.0") {
withVersion("2.1.0") {
implementation("androidx.lifecycle", "lifecycle-extensions", version)
implementation("androidx.lifecycle", "lifecycle-reactivestreams", version)
}
testImplementation("androidx.arch.core", "core-testing", "2.0.1")
testImplementation("androidx.arch.core", "core-testing", "2.1.0")
implementation(project(":lifecycle-ktx"))
implementation("androidx.paging", "paging-runtime", "2.1.0")
......@@ -134,14 +136,14 @@ dependencies {
// Utility
implementation("io.reactivex.rxjava2", "rxandroid", "2.1.1")
implementation("io.reactivex.rxjava2", "rxjava", "2.2.10")
implementation("io.reactivex.rxjava2", "rxjava", "2.2.12")
implementation("org.threeten", "threetenbp", "1.4.0", classifier = "no-tzdb")
implementation("org.jetbrains", "annotations", "17.0.0")
implementation("com.google.code.gson", "gson", "2.8.5")
implementation("commons-codec", "commons-codec", "1.12")
implementation("com.squareup.retrofit2", "retrofit", "2.6.0")
implementation("com.squareup.retrofit2", "converter-gson", "2.6.0")
implementation("com.github.pwittchen", "reactivenetwork-rx2", "3.0.3")
implementation("commons-codec", "commons-codec", "1.13")
implementation("com.squareup.retrofit2", "retrofit", "2.6.1")
implementation("com.squareup.retrofit2", "converter-gson", "2.6.1")
implementation("com.github.pwittchen", "reactivenetwork-rx2", "3.0.6")
withVersion("10.1.0") {
implementation("com.jakewharton", "butterknife", version)
kapt("com.jakewharton", "butterknife-compiler", version)
......@@ -155,7 +157,7 @@ dependencies {
}
// UI
implementation("com.leinardi.android", "speed-dial", "2.0.1")
implementation("com.leinardi.android", "speed-dial", "3.0.0")
implementation("me.zhanghai.android.materialprogressbar", "library", "1.6.1")
implementation("com.google.android", "flexbox", "1.1.0")
implementation(project(":ui_spinner"))
......@@ -179,7 +181,7 @@ dependencies {
}
// Dependency Injection
withVersion("2.23.2") {
withVersion("2.24") {
implementation("com.google.dagger", "dagger", version)
kapt("com.google.dagger", "dagger-compiler", version)
kapt("com.google.dagger", "dagger-android-processor", version)
......@@ -193,9 +195,9 @@ dependencies {
}
androidTestImplementation("junit", "junit", "4.12")
androidTestImplementation("androidx.test.espresso", "espresso-core", "3.1.0")
androidTestImplementation("androidx.test.espresso", "espresso-contrib", "3.1.0")
androidTestImplementation("androidx.test.ext", "junit", "1.0.0")
androidTestImplementation("androidx.test", "runner", "1.2.0")
androidTestImplementation("androidx.test", "rules", "1.2.0")
androidTestImplementation("androidx.test.espresso", "espresso-core", "3.3.0-alpha02")
androidTestImplementation("androidx.test.espresso", "espresso-contrib", "3.3.0-alpha02")
androidTestImplementation("androidx.test.ext", "junit", "1.1.2-alpha02")
androidTestImplementation("androidx.test", "runner", "1.3.0-alpha02")
androidTestImplementation("androidx.test", "rules", "1.3.0-alpha02")
}
{
"data": [
{
"name": "Android Architecture Components: Lifecycle",
"version": "1.1.1",
"name": "AndroidX",
"license": {
"short_name": "Apache-2.0",
"full_name": "Apache License"
},
"url": "https://android.googlesource.com/platform/frameworks/support/+/master/lifecycle"
},
{
"name": "Android Architecture Components: Paging",
"version": "1.0.0-alpha7",
"license": {
"short_name": "Apache-2.0",
"full_name": "Apache License"
},
"url": "https://android.googlesource.com/platform/frameworks/support/+/master/paging"
},
{
"name": "Android Architecture Components: Persistence",
"version": "1.1.0-rc1",
"license": {
"short_name": "Apache-2.0",
"full_name": "Apache License"
},
"url": "https://android.googlesource.com/platform/frameworks/support/+/master/persistence"
},
{
"name": "Android Architecture Components: Room",
"version": "1.1.0-rc1",
"license": {
"short_name": "Apache-2.0",
"full_name": "Apache License"
},
"url": "https://android.googlesource.com/platform/frameworks/support/+/master/persistence"
},
{
"name": "Android Support Library",
"version": "27.1.1",
"license": {
"short_name": "Apache-2.0",
"full_name": "Apache License"
},
"url": "https://android.googlesource.com/platform/frameworks/support/+/master"
},
{
"name": "Android Support Library: Constraint Layout",
"version": "1.1.0-beta6",
"license": {
"short_name": "Apache-2.0",
"full_name": "Apache License"
},
"url": "https://android.googlesource.com/platform/frameworks/opt/sherpa/+/studio-3.0/constraintlayout"
"url": "https://developer.android.com/jetpack/androidx"
},
{
"name": "atinject",
......
......@@ -169,9 +169,9 @@ class QuasselService : DaggerLifecycleService(),
}
}
override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
val result = super.onStartCommand(intent, flags, startId)
intent?.let(this@QuasselService::handleIntent)
handleIntent(intent)
return result
}
......@@ -493,7 +493,7 @@ class QuasselService : DaggerLifecycleService(),
super.onDestroy()
}
override fun onBind(intent: Intent?): QuasselBinder {
override fun onBind(intent: Intent): QuasselBinder {
super.onBind(intent)
return QuasselBinder(asyncBackend)
}
......
/*
* Quasseldroid - Quassel client for Android
*
* Copyright (c) 2019 Janne Mareike Koschinski
* Copyright (c) 2019 The Quassel Project
*
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 3 as published
* by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package de.kuschku.quasseldroid.ui.chat.archive
import de.kuschku.quasseldroid.viewmodel.data.BufferListItem
......
......@@ -130,6 +130,12 @@ class AboutFragment : DaggerFragment() {
license = apache2,
url = "https://code.google.com/archive/p/atinject/"
),
Library(
name = "Apache Commons Codec",
version = "1.13",
license = apache2,
url = "https://commons.apache.org/proper/commons-codec/"
),
Library(
name = "AutoService",
version = "1.0-rc6",
......@@ -150,7 +156,7 @@ class AboutFragment : DaggerFragment() {
),
Library(
name = "Dagger 2",
version = "2.23.2",
version = "2.24",
license = apache2,
url = "https://google.github.io/dagger/"
),
......@@ -163,6 +169,12 @@ class AboutFragment : DaggerFragment() {
),
url = "https://draculatheme.com/"
),
Library(
name = "FloatingActionButtonSpeedDial",
version = "3.0.0",
license = apache2,
url = "https://github.com/leinardi/FloatingActionButtonSpeedDial"
),
Library(
name = "Glide",
version = "4.9.0",
......@@ -186,7 +198,7 @@ class AboutFragment : DaggerFragment() {
),
Library(
name = "KotlinPoet",
version = "1.1.0",
version = "1.3.0",
license = apache2,
url = "https://github.com/square/kotlinpoet"
),
......@@ -198,7 +210,7 @@ class AboutFragment : DaggerFragment() {
),
Library(
name = "Kotlin Standard Library",
version = "1.3.41",
version = "1.3.50",
license = apache2,
url = "https://kotlinlang.org/"
),
......@@ -208,6 +220,12 @@ class AboutFragment : DaggerFragment() {
license = apache2,
url = "https://github.com/square/leakcanary"
),
Library(
name = "Material Components",
version = "1.1.0-alpha10",
license = apache2,
url = "https://github.com/material-components/material-components-android"
),
Library(
name = "Material Design Icons: Community",
license = License(
......@@ -259,6 +277,12 @@ class AboutFragment : DaggerFragment() {
),
url = "http://www.reactive-streams.org/"
),
Library(
name = "ReactiveNetwork",
version = "3.0.6",
license = apache2,
url = "https://github.com/pwittchen/ReactiveNetwork"
),
Library(
name = "RecyclerView-FastScroll",
version = "2.0.",
......@@ -267,13 +291,13 @@ class AboutFragment : DaggerFragment() {
),
Library(
name = "Retrofit",
version = "2.6.0",
version = "2.6.1",
license = apache2,
url = "https://square.github.io/retrofit/"
),
Library(
name = "RxJava",
version = "2.2.10",
version = "2.2.12",
license = apache2,
url = "https://github.com/ReactiveX/RxJava"
),
......
......@@ -28,7 +28,7 @@ import com.google.android.material.bottomsheet.BottomSheetBehavior
class DragInterceptBottomSheetBehavior<V : View> : BottomSheetBehavior<V> {
constructor() : super()
constructor(context: Context?, attrs: AttributeSet?) : super(context, attrs)
constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
var allowDragging = true
......
......@@ -23,23 +23,17 @@ import android.content.Context
import android.content.pm.PackageManager
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import androidx.fragment.app.Fragment
import dagger.android.AndroidInjection
import dagger.android.AndroidInjector
import dagger.android.DispatchingAndroidInjector
import dagger.android.HasFragmentInjector
import dagger.android.support.HasSupportFragmentInjector
import dagger.android.HasAndroidInjector
import de.kuschku.libquassel.util.helper.nullIf
import de.kuschku.quasseldroid.settings.AppearanceSettings
import javax.inject.Inject
abstract class ThemedActivity : AppCompatActivity(), HasSupportFragmentInjector,
HasFragmentInjector {
abstract class ThemedActivity : AppCompatActivity(), HasAndroidInjector {
@Inject
lateinit var supportFragmentInjector: DispatchingAndroidInjector<Fragment>
@Inject
lateinit var frameworkFragmentInjector: DispatchingAndroidInjector<android.app.Fragment>
lateinit var androidInjector: DispatchingAndroidInjector<Any>
@Inject
lateinit var appearanceSettings: AppearanceSettings
......@@ -56,11 +50,7 @@ abstract class ThemedActivity : AppCompatActivity(), HasSupportFragmentInjector,
super.attachBaseContext(LocaleHelper.setLocale(newBase))
}
override fun supportFragmentInjector(): AndroidInjector<Fragment>? {
return supportFragmentInjector
}
override fun fragmentInjector(): AndroidInjector<android.app.Fragment>? {
return frameworkFragmentInjector
override fun androidInjector(): AndroidInjector<Any> {
return androidInjector
}
}
......@@ -20,24 +20,23 @@
package de.kuschku.quasseldroid.util.ui.settings
import android.content.Context
import androidx.fragment.app.Fragment
import dagger.android.AndroidInjector
import dagger.android.DispatchingAndroidInjector
import dagger.android.HasAndroidInjector
import dagger.android.support.AndroidSupportInjection
import dagger.android.support.HasSupportFragmentInjector
import javax.inject.Inject
abstract class DaggerPreferenceFragmentCompat : AttachingPreferenceFragmentCompat(),
HasSupportFragmentInjector {
HasAndroidInjector {
@Inject
lateinit var childFragmentInjector: DispatchingAndroidInjector<Fragment>
lateinit var androidInjector: DispatchingAndroidInjector<Any>
override fun onAttach(context: Context) {
AndroidSupportInjection.inject(this)
super.onAttach(context)
}
override fun supportFragmentInjector(): AndroidInjector<Fragment>? {
return childFragmentInjector
override fun androidInjector(): AndroidInjector<Any> {
return androidInjector
}
}
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?><!--
Quasseldroid - Quassel client for Android
Copyright (c) 2019 Janne Mareike Koschinski
Copyright (c) 2019 The Quassel Project
This program is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License version 3 as published
by the Free Software Foundation.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/content"
......
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?><!--
Quasseldroid - Quassel client for Android
Copyright (c) 2019 Janne Mareike Koschinski
Copyright (c) 2019 The Quassel Project
This program is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License version 3 as published
by the Free Software Foundation.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
......
......@@ -26,7 +26,7 @@ buildscript {
}
dependencies {
classpath("com.android.tools.build:gradle:3.4.2")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.41")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50")
}
}
......
/*
* Quasseldroid - Quassel client for Android
*
* Copyright (c) 2019 Janne Mareike Koschinski
* Copyright (c) 2019 The Quassel Project
*
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 3 as published
* by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
plugins {
application
kotlin("jvm")
kotlin("kapt")
}
application {
mainClassName = "de.kuschku.cli.MainKt"
}
dependencies {
implementation(kotlin("stdlib", "1.3.41"))
implementation("io.reactivex.rxjava2", "rxjava", "2.2.10")
implementation("info.picocli", "picocli", "3.9.0")
implementation(project(":lib"))
testImplementation("junit", "junit", "4.12")
}
/*
* Quasseldroid - Quassel client for Android
*
* Copyright (c) 2019 Janne Mareike Koschinski
* Copyright (c) 2019 The Quassel Project
*
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 3 as published
* by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package de.kuschku.desktop
import picocli.CommandLine
class CliArguments {
@CommandLine.Option(names = ["--user"])
var user: String = ""
@CommandLine.Option(names = ["--pass"])
var pass: String = ""
@CommandLine.Option(names = ["--host"])
var host: String = ""
@CommandLine.Option(names = ["--port"])
var port: Int = 4242
override fun toString(): String {
return "CliArguments(user='$user', pass='$pass', host='$host', port='$port')"
}
override fun equals(other: Any?): Boolean {
if (this === other) return true
if (javaClass != other?.javaClass) return false
other as CliArguments
if (user != other.user) return false
if (pass != other.pass) return false
if (host != other.host) return false
if (port != other.port) return false
return true
}
override fun hashCode(): Int {
var result = user.hashCode()
result = 31 * result + pass.hashCode()
result = 31 * result + host.hashCode()
result = 31 * result + port.hashCode()
return result
}
}
/*
* Quasseldroid - Quassel client for Android
*
* Copyright (c) 2019 Janne Mareike Koschinski
* Copyright (c) 2019 The Quassel Project
*
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 3 as published
* by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package de.kuschku.desktop
import picocli.CommandLine
fun main(vararg args: String) {
val cliArguments = CliArguments()
CommandLine(cliArguments).parse(*args)
}
......@@ -29,10 +29,10 @@ tasks.withType<KotlinCompile> {
}
dependencies {
implementation(kotlin("stdlib", "1.3.41"))
implementation(kotlin("stdlib", "1.3.50"))
implementation(project(":invokerannotations"))
implementation("org.jetbrains.kotlin", "kotlin-compiler-embeddable", "1.3.41")
implementation("com.squareup", "kotlinpoet", "1.1.0")
implementation("org.jetbrains.kotlin", "kotlin-compiler-embeddable", "1.3.50")
implementation("com.squareup", "kotlinpoet", "1.3.0")
implementation("com.google.auto.service:auto-service:1.0-rc6")
kapt("com.google.auto.service:auto-service:1.0-rc6")
}
......@@ -251,5 +251,20 @@ class Parser(
}
private fun buildImports(wildcard: List<String>, named: List<Pair<String, String>>) =
(wildcard.flatMap(this::resolveWildcardImport) + named).toMap()
(
wildcard.flatMap(this::resolveWildcardImport) +
named +
listOf(
"Boolean",
"Byte",
"UByte",
"Short",
"UShort",
"Int",
"UInt",
"Long",
"ULong",
"Char"
).map { Pair(it, "kotlin.$it") }
).toMap()
}
......@@ -23,12 +23,12 @@ plugins {
}
dependencies {
implementation(kotlin("stdlib", "1.3.41"))
implementation(kotlin("stdlib", "1.3.50"))
implementation("androidx.annotation", "annotation", "1.0.0")
implementation("androidx.annotation", "annotation", "1.1.0")
implementation("org.threeten", "threetenbp", "1.4.0")
implementation("io.reactivex.rxjava2", "rxjava", "2.2.10")
implementation("io.reactivex.rxjava2", "rxjava", "2.2.12")
implementation(project(":invokerannotations"))
kapt(project(":invokergenerator"))
......
......@@ -22,9 +22,9 @@ plugins {
}
dependencies {
implementation(kotlin("stdlib", "1.3.41"))
implementation(kotlin("stdlib", "1.3.50"))
implementation("androidx.annotation", "annotation", "1.0.0")
implementation("androidx.annotation", "annotation", "1.1.0")
implementation("androidx.lifecycle", "lifecycle-common", "2.0.0")
implementation("androidx.lifecycle", "lifecycle-common", "2.1.0")
}
......@@ -44,8 +44,8 @@ android {
}
dependencies {
implementation(kotlin("stdlib", "1.3.41"))
implementation(kotlin("stdlib", "1.3.50"))
implementation("com.google.code.gson", "gson", "2.8.5")
implementation("androidx.annotation", "annotation", "1.0.1")
implementation("androidx.annotation", "annotation", "1.1.0")
}
......@@ -51,11 +51,11 @@ android {
}
dependencies {
implementation(kotlin("stdlib", "1.3.41"))
implementation(kotlin("stdlib", "1.3.50"))
implementation("androidx.appcompat", "appcompat", "1.0.2")
implementation("androidx.appcompat", "appcompat", "1.1.0")
withVersion("2.1.0") {
withVersion("2.2.0-rc01") {
implementation("androidx.room", "room-runtime", version)
kapt("androidx.room", "room-compiler", version)
implementation("androidx.room", "room-rxjava2", version)
......
......@@ -20,7 +20,6 @@
rootProject.buildFileName = 'build.gradle.kts'
include ':app',
':desktop',
':invokerannotations',
':invokergenerator',
':lib',
......
......@@ -44,6 +44,6 @@ android {
}
dependencies {
implementation(kotlin("stdlib", "1.3.41"))
implementation("androidx.appcompat", "appcompat", "1.0.2")
implementation(kotlin("stdlib", "1.3.50"))
implementation("androidx.appcompat", "appcompat", "1.1.0")
}
......@@ -39,22 +39,22 @@ android {
lintOptions {
isWarningsAsErrors = true
lintConfig = file("../lint.xml")
setLintConfig(file("../lint.xml"))
}
}
dependencies {
implementation(kotlin("stdlib", "1.3.41"))
implementation(kotlin("stdlib", "1.3.50"))
implementation("androidx.appcompat", "appcompat", "1.0.2")
withVersion("2.0.0") {
implementation("androidx.appcompat", "appcompat", "1.1.0")
withVersion("2.1.0") {
implementation("androidx.lifecycle", "lifecycle-extensions", version)
implementation("androidx.lifecycle", "lifecycle-reactivestreams", version)
}
// Utility
implementation("io.reactivex.rxjava2", "rxandroid", "2.1.1")
implementation("io.reactivex.rxjava2", "rxjava", "2.2.10")
implementation("io.reactivex.rxjava2", "rxjava", "2.2.12")
implementation("org.threeten", "threetenbp", "1.4.0", classifier = "no-tzdb")
implementation("org.jetbrains", "annotations", "17.0.0")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.