Commit ae3c9d76 authored by Mygod's avatar Mygod

Update dependencies

parent 6af61634
...@@ -23,11 +23,8 @@ install: ...@@ -23,11 +23,8 @@ install:
- unzip -q tools.zip - unzip -q tools.zip
- popd - popd
- touch $HOME/.android/repositories.cfg - touch $HOME/.android/repositories.cfg
- yes | sdkmanager - yes | sdkmanager --licenses > /dev/null
"build-tools;28.0.1" - sdkmanager ndk-bundle > /dev/null
ndk-bundle
"platforms;android-28"
>/dev/null
script: script:
- ./gradlew assembleDebug check - ./gradlew assembleDebug check
...@@ -10,7 +10,7 @@ buildscript { ...@@ -10,7 +10,7 @@ buildscript {
compileSdkVersion = 28 compileSdkVersion = 28
buildToolsVersion = '28.0.1' buildToolsVersion = '28.0.1'
supportLibraryVersion = '28.0.0-alpha3' supportLibraryVersion = '28.0.0-alpha3'
takisoftFixVersion = '27.1.1.1' takisoftFixVersion = '27.1.1.2'
roomVersion = '1.1.1' roomVersion = '1.1.1'
junitVersion = '4.12' junitVersion = '4.12'
androidTestVersion = '1.0.2' androidTestVersion = '1.0.2'
...@@ -23,7 +23,7 @@ buildscript { ...@@ -23,7 +23,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.1.3' classpath 'com.android.tools.build:gradle:3.2.0-beta03'
classpath 'com.github.ben-manes:gradle-versions-plugin:0.20.0' classpath 'com.github.ben-manes:gradle-versions-plugin:0.20.0'
classpath 'com.google.gms:google-services:4.0.1' classpath 'com.google.gms:google-services:4.0.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
......
...@@ -5,5 +5,6 @@ ...@@ -5,5 +5,6 @@
</issue> </issue>
<issue id="ImpliedQuantity" severity="warning" /> <issue id="ImpliedQuantity" severity="warning" />
<issue id="ExtraTranslation" severity="warning" /> <issue id="ExtraTranslation" severity="warning" />
<issue id="MissingDefaultResource" severity="warning" />
<issue id="MissingTranslation" severity="informational" /> <issue id="MissingTranslation" severity="informational" />
</lint> </lint>
...@@ -117,7 +117,6 @@ class App : Application() { ...@@ -117,7 +117,6 @@ class App : Application() {
super.onCreate() super.onCreate()
app = this app = this
AppCompatDelegate.setCompatVectorFromResourcesEnabled(true) AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
PreferenceFragmentCompat.registerPreferenceFragment(IconListPreference::class.java, PreferenceFragmentCompat.registerPreferenceFragment(IconListPreference::class.java,
BottomSheetPreferenceDialogFragment::class.java) BottomSheetPreferenceDialogFragment::class.java)
......
...@@ -6,7 +6,6 @@ import android.content.Context ...@@ -6,7 +6,6 @@ import android.content.Context
import android.content.Intent import android.content.Intent
import android.content.pm.PackageInfo import android.content.pm.PackageInfo
import android.content.res.Resources import android.content.res.Resources
import android.graphics.Bitmap
import android.graphics.BitmapFactory import android.graphics.BitmapFactory
import android.graphics.ImageDecoder import android.graphics.ImageDecoder
import android.net.Uri import android.net.Uri
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res/com.github.shadowsocks"> xmlns:app="http://schemas.android.com/apk/res-auto">
<SwitchPreference android:key="isAutoConnect" <SwitchPreference android:key="isAutoConnect"
android:persistent="false" android:persistent="false"
android:summary="@string/auto_connect_summary" android:summary="@string/auto_connect_summary"
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res/com.github.shadowsocks"> xmlns:app="http://schemas.android.com/apk/res-auto">
<AutoSummaryEditTextPreference <AutoSummaryEditTextPreference
android:key="profileName" android:key="profileName"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment