From afd51b4959fc125370aff0ec07eeca382e0a13db Mon Sep 17 00:00:00 2001 From: Mygod Date: Tue, 15 Jan 2019 15:24:21 +0800 Subject: [PATCH] Update dependencies --- app/build.gradle | 2 +- .../com/github/shadowsocks/plugin/v2ray/ConfigFragment.kt | 4 ---- build.gradle | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 5ae6fd3..32fedec 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -72,7 +72,7 @@ tasks.whenTaskAdded { task -> dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "androidx.preference:preference:1.1.0-alpha02" - implementation 'com.github.shadowsocks:plugin:1.0.0' + implementation 'com.github.shadowsocks:plugin:1.1.0' implementation 'com.takisoft.preferencex:preferencex-simplemenu:1.0.0' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion" testImplementation 'junit:junit:4.12' diff --git a/app/src/main/java/com/github/shadowsocks/plugin/v2ray/ConfigFragment.kt b/app/src/main/java/com/github/shadowsocks/plugin/v2ray/ConfigFragment.kt index bbe2d9c..2edd2c3 100644 --- a/app/src/main/java/com/github/shadowsocks/plugin/v2ray/ConfigFragment.kt +++ b/app/src/main/java/com/github/shadowsocks/plugin/v2ray/ConfigFragment.kt @@ -42,10 +42,6 @@ class ConfigFragment : PreferenceFragmentCompat(), Preference.OnPreferenceChange private val path by lazy { findPreference("path") } private val certRaw by lazy { findPreference("certRaw") } - // todo: remove me for updated plugin lib - private fun PluginOptions.putWithDefault(key: String, value: String?, default: String? = null) = - if (value == null || value == default) remove(key) else put(key, value) - private fun readMode(value: String = mode.value) = when (value) { "websocket-http" -> Pair(null, null) "websocket-tls" -> Pair(null, "") diff --git a/build.gradle b/build.gradle index e00df37..251e421 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.3.0' classpath 'com.github.ben-manes:gradle-versions-plugin:0.20.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" }