Update dependencies
Update Dagger and Kotlin versions. Format LoginActivity. Remove parallel execution and deactivate Gradle daemon.
This commit is contained in:
parent
65efcb2451
commit
0f22127a12
5 changed files with 13 additions and 10 deletions
|
@ -176,6 +176,9 @@ dependencies {
|
|||
implementation(ApplicationLibs.Google.exoplayer)
|
||||
implementation(ApplicationLibs.Google.materialDesign)
|
||||
|
||||
implementation(ApplicationLibs.Kotlin.stdlib)
|
||||
implementation(ApplicationLibs.Kotlin.stdlibJdk)
|
||||
|
||||
implementation(ApplicationLibs.RxJava.rxAndroid)
|
||||
implementation(ApplicationLibs.RxJava.rxJava)
|
||||
implementation(ApplicationLibs.RxJava.rxKotlin)
|
||||
|
@ -187,8 +190,6 @@ dependencies {
|
|||
implementation(ApplicationLibs.Square.okhttp)
|
||||
implementation(ApplicationLibs.Square.okhttpBrotli)
|
||||
|
||||
implementation(ApplicationLibs.Kotlin.stdlibJdk)
|
||||
|
||||
implementation(ApplicationLibs.androidImageCropper)
|
||||
implementation(ApplicationLibs.autodispose)
|
||||
implementation(ApplicationLibs.autodisposeAndroidArchComp)
|
||||
|
|
|
@ -56,7 +56,7 @@ class LoginActivity : BaseActivity(), Injectable {
|
|||
val host = BuildConfig.APPLICATION_ID
|
||||
return "$scheme://$host/"
|
||||
}
|
||||
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
|
||||
|
@ -69,7 +69,7 @@ class LoginActivity : BaseActivity(), Injectable {
|
|||
}
|
||||
appNameEditText.setText(getString(R.string.app_name))
|
||||
appNameEditText.setSelection(getString(R.string.app_name).length)
|
||||
|
||||
|
||||
websiteEditText.setText(getString(R.string.tusky_website))
|
||||
websiteEditText.setSelection(getString(R.string.tusky_website).length)
|
||||
}
|
||||
|
@ -124,7 +124,7 @@ class LoginActivity : BaseActivity(), Injectable {
|
|||
}
|
||||
return super.onOptionsItemSelected(item)
|
||||
}
|
||||
|
||||
|
||||
private fun onSettingsButtonClick() {
|
||||
if(extendedSettings.visibility == View.GONE) {
|
||||
extendedSettings.visibility = View.VISIBLE
|
||||
|
@ -183,14 +183,14 @@ class LoginActivity : BaseActivity(), Injectable {
|
|||
Log.e(TAG, Log.getStackTraceString(t))
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
var appname = getString(R.string.app_name)
|
||||
var website = getString(R.string.tusky_website)
|
||||
if(extendedSettings.visibility == View.VISIBLE) {
|
||||
appname = appNameEditText.text.toString()
|
||||
website = websiteEditText.text.toString()
|
||||
}
|
||||
|
||||
|
||||
mastodonApi
|
||||
.authenticateApp(domain, appname, oauthRedirectUri,
|
||||
OAUTH_SCOPES, website)
|
||||
|
|
|
@ -10,7 +10,7 @@ object ApplicationLibs {
|
|||
const val conscryptAndroid = "2.5.1"
|
||||
const val constraintlayout = "2.1.0"
|
||||
const val coreKtx = "1.3.2"
|
||||
const val dagger = "2.30.1"
|
||||
const val dagger = "2.38.1"
|
||||
const val emoji = "1.1.0"
|
||||
const val exifInterface = "1.3.2"
|
||||
const val exoplayer = "2.15.0"
|
||||
|
|
|
@ -3,7 +3,7 @@ import org.gradle.api.JavaVersion
|
|||
import org.gradle.api.artifacts.dsl.RepositoryHandler
|
||||
import org.gradle.kotlin.dsl.maven
|
||||
|
||||
const val kotlinVersion = "1.4.21"
|
||||
const val kotlinVersion = "1.5.30"
|
||||
|
||||
object AndroidSDK {
|
||||
const val compileSdk = 30
|
||||
|
|
|
@ -2,7 +2,9 @@
|
|||
# Put 4GiB of memory for Gradle
|
||||
org.gradle.jvmargs = -Xmx4096m
|
||||
# Parallel execution
|
||||
org.gradle.parallel = true
|
||||
org.gradle.parallel = false
|
||||
# Disable Gradle daemon
|
||||
org.gradle.daemon = false
|
||||
# Use AndroidX libraries
|
||||
android.useAndroidX = true
|
||||
# Disable incremental annotations
|
||||
|
|
Loading…
Add table
Reference in a new issue