Remove yaml dependency for mini flavor

This commit is contained in:
世界 2021-03-14 23:15:57 +08:00
parent 8007d57bec
commit 7fff3339ca
No known key found for this signature in database
GPG Key ID: CD109927C34A63C4
2 changed files with 77 additions and 68 deletions

View File

@ -73,74 +73,6 @@ if (!gradle.startParameter.taskNames.isEmpty()) {
}
}
def okHttpVersion = '5.0.0-alpha.2'
def fcmVersion = '21.0.1'
def crashlyticsVersion = '17.4.0'
def playCoreVersion = '1.10.0'
dependencies {
implementation "androidx.browser:browser:1.3.0"
implementation 'androidx.core:core-ktx:1.5.0-beta03'
implementation 'androidx.palette:palette-ktx:1.0.0'
implementation 'androidx.viewpager:viewpager:1.0.0'
implementation 'androidx.exifinterface:exifinterface:1.3.2'
implementation "androidx.interpolator:interpolator:1.0.0"
implementation 'androidx.dynamicanimation:dynamicanimation:1.0.0'
implementation 'androidx.multidex:multidex:2.0.1'
implementation 'androidx.sharetarget:sharetarget:1.1.0'
compileOnly 'org.checkerframework:checker-qual:3.11.0'
compileOnly 'org.checkerframework:checker-compat-qual:2.5.5'
// don't change this :)
//noinspection GradleDependency
implementation 'com.googlecode.mp4parser:isoparser:1.0.6'
implementation 'com.google.code.gson:gson:2.8.6'
implementation 'org.osmdroid:osmdroid-android:6.1.10'
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.31'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3'
implementation "com.squareup.okhttp3:okhttp:$okHttpVersion"
implementation 'dnsjava:dnsjava:3.3.1'
implementation 'org.dizitart:nitrite:3.4.3'
implementation 'cn.hutool:hutool-core:5.5.9'
implementation 'cn.hutool:hutool-crypto:5.5.9'
implementation 'cn.hutool:hutool-http:5.5.9'
implementation 'org.yaml:snakeyaml:1.28'
implementation 'com.jakewharton:process-phoenix:2.0.0'
implementation project(":openpgp-api")
compileOnly fileTree("libs")
compileOnly "com.google.firebase:firebase-messaging:$fcmVersion"
compileOnly "com.google.firebase:firebase-crashlytics:$crashlyticsVersion"
compileOnly "com.google.android.play:core:$playCoreVersion"
debugImplementation "com.google.firebase:firebase-messaging:$fcmVersion"
debugImplementation "com.google.firebase:firebase-crashlytics:$crashlyticsVersion"
debugImplementation "com.google.android.play:core:$playCoreVersion"
releaseImplementation "com.google.firebase:firebase-messaging:$fcmVersion"
releaseImplementation "com.google.firebase:firebase-crashlytics:$crashlyticsVersion"
releaseImplementation "com.google.android.play:core:$playCoreVersion"
testImplementation 'junit:junit:4.13.2'
testImplementation 'androidx.test:core:1.3.0'
testImplementation 'org.robolectric:robolectric:4.5.1'
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
if (!targetAbi.isBlank()) {
implementation project(":ss-rust")
implementation project(":ssr-libev")
}
}
android {
compileSdkVersion 30
buildToolsVersion '30.0.3'
@ -424,6 +356,78 @@ android {
}
def okHttpVersion = '5.0.0-alpha.2'
def fcmVersion = '21.0.1'
def crashlyticsVersion = '17.4.0'
def playCoreVersion = '1.10.0'
dependencies {
implementation "androidx.browser:browser:1.3.0"
implementation 'androidx.core:core-ktx:1.5.0-beta03'
implementation 'androidx.palette:palette-ktx:1.0.0'
implementation 'androidx.viewpager:viewpager:1.0.0'
implementation 'androidx.exifinterface:exifinterface:1.3.2'
implementation "androidx.interpolator:interpolator:1.0.0"
implementation 'androidx.dynamicanimation:dynamicanimation:1.0.0'
implementation 'androidx.multidex:multidex:2.0.1'
implementation 'androidx.sharetarget:sharetarget:1.1.0'
compileOnly 'org.checkerframework:checker-qual:3.11.0'
compileOnly 'org.checkerframework:checker-compat-qual:2.5.5'
// don't change this :)
//noinspection GradleDependency
implementation 'com.googlecode.mp4parser:isoparser:1.0.6'
implementation 'com.google.code.gson:gson:2.8.6'
implementation 'org.osmdroid:osmdroid-android:6.1.10'
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.31'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3'
implementation "com.squareup.okhttp3:okhttp:$okHttpVersion"
implementation 'dnsjava:dnsjava:3.3.1'
implementation 'org.dizitart:nitrite:3.4.3'
implementation 'cn.hutool:hutool-core:5.5.9'
implementation 'cn.hutool:hutool-crypto:5.5.9'
implementation 'cn.hutool:hutool-http:5.5.9'
implementation 'com.jakewharton:process-phoenix:2.0.0'
compileOnly 'org.yaml:snakeyaml:1.28'
fullImplementation 'org.yaml:snakeyaml:1.28'
implementation project(":openpgp-api")
compileOnly fileTree("libs")
compileOnly "com.google.firebase:firebase-messaging:$fcmVersion"
compileOnly "com.google.firebase:firebase-crashlytics:$crashlyticsVersion"
compileOnly "com.google.android.play:core:$playCoreVersion"
debugImplementation "com.google.firebase:firebase-messaging:$fcmVersion"
debugImplementation "com.google.firebase:firebase-crashlytics:$crashlyticsVersion"
debugImplementation "com.google.android.play:core:$playCoreVersion"
releaseImplementation "com.google.firebase:firebase-messaging:$fcmVersion"
releaseImplementation "com.google.firebase:firebase-crashlytics:$crashlyticsVersion"
releaseImplementation "com.google.android.play:core:$playCoreVersion"
testImplementation 'junit:junit:4.13.2'
testImplementation 'androidx.test:core:1.3.0'
testImplementation 'org.robolectric:robolectric:4.5.1'
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
if (!targetAbi.isBlank()) {
implementation project(":ss-rust")
implementation project(":ssr-libev")
}
}
apply plugin: 'com.google.gms.google-services'
apply plugin: 'com.google.firebase.crashlytics'

View File

@ -97,6 +97,11 @@ object ProxyUtil {
}
if (text.contains("proxies:\n")) {
if (BuildVars.isMini) {
error(LocaleController.getString("MiniVersionAlert", R.string.MiniVersionAlert))
}
// clash
for (proxy in (Yaml().loadAs(text, Map::class.java)["proxies"] as List<Map<String, Any?>>)) {