From 5f6fb3c6eb57d2e9ad87bbbc862afdcbdb1f4276 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= <i@sekai.icu>
Date: Fri, 10 Dec 2021 16:21:58 +0800
Subject: [PATCH] Update dependencies

---
 .github/workflows/debug.yml              |  4 ++--
 .github/workflows/release.yml            |  2 +-
 .idea/gradle.xml                         |  4 +---
 app/build.gradle.kts                     | 12 +++++++-----
 build.gradle.kts                         |  4 +---
 buildSrc/build.gradle.kts                |  7 ++++---
 buildSrc/src/main/kotlin/Helpers.kt      |  2 ++
 external/v2ray-core                      |  2 +-
 gradle/wrapper/gradle-wrapper.properties |  4 ++--
 library/core                             |  2 +-
 repositories.gradle.kts                  |  3 ++-
 sager.properties                         |  4 ++--
 12 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml
index 6007cc51..86c4cf0a 100644
--- a/.github/workflows/debug.yml
+++ b/.github/workflows/debug.yml
@@ -32,7 +32,7 @@ jobs:
         uses: actions/setup-go@v2
         if: steps.cache.outputs.cache-hit != 'true'
         with:
-          go-version: 1.17.3
+          go-version: 1.17.5
       - name: Native Build
         if: steps.cache.outputs.cache-hit != 'true'
         run: ./run lib core
@@ -180,7 +180,7 @@ jobs:
         uses: actions/setup-go@v2
         if: steps.cache.outputs.cache-hit != 'true'
         with:
-          go-version: 1.17.2
+          go-version: 1.17.5
       - name: Native Build
         if: steps.cache.outputs.cache-hit != 'true'
         run: ./run plugin hysteria
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ead03961..0b6e28df 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -45,7 +45,7 @@ jobs:
         uses: actions/setup-go@v2
         if: steps.cache.outputs.cache-hit != 'true'
         with:
-          go-version: 1.17.3
+          go-version: 1.17.5
       - name: Gradle cache
         uses: actions/cache@v2
         if: steps.cache.outputs.cache-hit != 'true'
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 8d7718a6..23653483 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -37,11 +37,9 @@
           </compositeBuild>
         </compositeConfiguration>
         <option name="testRunner" value="GRADLE" />
-        <option name="disableWrapperSourceDistributionNotification" value="true" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.8.3-bin/7ykxq50lst7lb7wx1nijpicxn/gradle-6.8.3" />
-        <option name="gradleJvm" value="Android Studio default JDK" />
+        <option name="gradleJvm" value="11" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index dbd2d464..ea0b1d41 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -29,6 +29,8 @@ android {
 
 dependencies {
 
+    val hutoolVersion = rootProject.extra["hutoolVersion"].toString()
+
     implementation(fileTree("libs"))
     compileOnly(project(":library:stub"))
     implementation(project(":library:include"))
@@ -52,10 +54,10 @@ dependencies {
     implementation(project(":external:preferencex:preferencex-colorpicker"))
 
     implementation("com.google.android.material:material:1.4.0")
-    implementation("cn.hutool:hutool-core:5.7.16")
-    implementation("cn.hutool:hutool-cache:5.7.16")
-    implementation("cn.hutool:hutool-json:5.7.16")
-    implementation("cn.hutool:hutool-crypto:5.7.16")
+    implementation("cn.hutool:hutool-core:$hutoolVersion")
+    implementation("cn.hutool:hutool-cache:$hutoolVersion")
+    implementation("cn.hutool:hutool-json:$hutoolVersion")
+    implementation("cn.hutool:hutool-crypto:$hutoolVersion")
     implementation("com.google.code.gson:gson:2.8.9")
     implementation("com.google.zxing:core:3.4.1")
 
@@ -65,7 +67,7 @@ dependencies {
 
     implementation("org.yaml:snakeyaml:1.29")
     implementation("com.github.daniel-stoneuk:material-about-library:3.2.0-rc01")
-    implementation("com.mikepenz:aboutlibraries:8.9.3")
+    implementation("com.mikepenz:aboutlibraries:8.9.4")
     implementation("com.jakewharton:process-phoenix:2.1.2")
     implementation("com.esotericsoftware:kryo:5.2.0")
     implementation("org.conscrypt:conscrypt-android:2.5.2")
diff --git a/build.gradle.kts b/build.gradle.kts
index c689482e..ae331b16 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ allprojects {
     apply(plugin = "com.github.ben-manes.versions")
     tasks.named<DependencyUpdatesTask>("dependencyUpdates") {
         val regex = listOf(
-            "alpha", "beta", "rc", "cr", "m", "preview", "b", "ea"
+            "alpha", "beta", "rc", "cr", "m", "preview","a", "b", "ea", "jre"
         ).map { qualifier -> Regex("(?i).*[.-]$qualifier[.\\d-+]*") }
         resolutionStrategy {
             componentSelection {
@@ -44,8 +44,6 @@ subprojects {
 }
 
 tasks.named<Wrapper>("wrapper") {
-    distributionType = Wrapper.DistributionType.ALL
-
     doLast {
         val sha256 = java.net.URL("$distributionUrl.sha256")
             .openStream()
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 4d7bc2ba..fce9cb10 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    kotlin("jvm") version "1.5.30"
+    kotlin("jvm") version "1.5.31"
     `java-gradle-plugin`
     `kotlin-dsl`
 }
@@ -9,11 +9,12 @@ apply(from = "../repositories.gradle.kts")
 dependencies {
     val androidPluginVersion = rootProject.extra["androidPluginVersion"].toString()
     val kotlinVersion = rootProject.extra["kotlinVersion"].toString()
+    val hutoolVersion = rootProject.extra["hutoolVersion"].toString()
     implementation("com.android.tools.build:gradle:$androidPluginVersion")
     implementation("com.android.tools.build:gradle-api:$androidPluginVersion")
     implementation(kotlin("gradle-plugin", kotlinVersion))
-    implementation(kotlin("stdlib"))
-    implementation("cn.hutool:hutool-crypto:5.7.16")
+    implementation(kotlin("stdlib", kotlinVersion))
+    implementation("cn.hutool:hutool-crypto:$hutoolVersion")
     implementation("org.tukaani:xz:1.9")
     implementation("com.github.triplet.gradle:play-publisher:3.6.0")
     implementation("org.kohsuke:github-api:1.131")
diff --git a/buildSrc/src/main/kotlin/Helpers.kt b/buildSrc/src/main/kotlin/Helpers.kt
index e9832aac..ac26d37f 100644
--- a/buildSrc/src/main/kotlin/Helpers.kt
+++ b/buildSrc/src/main/kotlin/Helpers.kt
@@ -512,6 +512,8 @@ fun Project.setupApp() {
     }
 
     dependencies {
+
+        add("implementation", kotlin("stdlib", "${rootProject.extra["kotlinVersion"]}"))
         add("implementation", project(":plugin:api"))
         add("testImplementation", "junit:junit:4.13.2")
         add("androidTestImplementation", "androidx.test.ext:junit:1.1.3")
diff --git a/external/v2ray-core b/external/v2ray-core
index f4d52259..353a928b 160000
--- a/external/v2ray-core
+++ b/external/v2ray-core
@@ -1 +1 @@
-Subproject commit f4d52259ece0690af7bb6795f7338ab2b1693fcc
+Subproject commit 353a928b14bf318cdac4db06b5d9d8d9cd85fce4
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index fc89a986..946e1bda 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionSha256Sum=00b273629df4ce46e68df232161d5a7c4e495b9a029ce6e0420f071e21316867
\ No newline at end of file
+distributionSha256Sum=9afb3ca688fc12c761a0e9e4321e4d24e977a4a8916c8a768b1fe05ddb4d6b66
\ No newline at end of file
diff --git a/library/core b/library/core
index a8135513..af2b6e69 160000
--- a/library/core
+++ b/library/core
@@ -1 +1 @@
-Subproject commit a8135513646133360c145e9ead6e2a6f9b71067b
+Subproject commit af2b6e69ed963ed95959bd20e47d10992ea5c308
diff --git a/repositories.gradle.kts b/repositories.gradle.kts
index 837e27bf..f5c7d2a4 100644
--- a/repositories.gradle.kts
+++ b/repositories.gradle.kts
@@ -1,6 +1,7 @@
 rootProject.extra.apply {
-    set("androidPluginVersion", "7.0.3")
+    set("androidPluginVersion", "7.0.4")
     set("kotlinVersion", "1.5.31")
+    set("hutoolVersion", "5.7.17")
 }
 
 repositories {
diff --git a/sager.properties b/sager.properties
index df594f5d..acc52b34 100644
--- a/sager.properties
+++ b/sager.properties
@@ -1,6 +1,6 @@
 PACKAGE_NAME=io.nekohasekai.sagernet
-VERSION_NAME=0.6-beta10
-VERSION_CODE=128
+VERSION_NAME=0.6-beta11
+VERSION_CODE=129
 
 NAIVE_VERSION_NAME=96.0.4664.45-1
 NAIVE_VERSION=9