From de97dd9825ca37b7146e5bae17351f7a6504e7be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= Date: Mon, 7 Jun 2021 09:59:15 +0800 Subject: [PATCH] Update dependencies --- .github/workflows/release.yml | 1 + app/src/main/res/layout/layout_main.xml | 2 +- build.gradle.kts | 2 +- external/colorpicker/build.gradle | 2 +- external/flexbox/build.gradle | 2 +- sager.properties | 4 ++-- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 61c5a47d..38722546 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -325,6 +325,7 @@ jobs: git submodule update --init 'app/*' - name: Release Build run: | + git submodule update --init library/v2ray echo "sdk.dir=${ANDROID_HOME}" > local.properties echo "ndk.dir=${ANDROID_HOME}/ndk/21.4.7075529" >> local.properties export LOCAL_PROPERTIES="${{ secrets.LOCAL_PROPERTIES }}" diff --git a/app/src/main/res/layout/layout_main.xml b/app/src/main/res/layout/layout_main.xml index 127731a2..f1aae5bd 100644 --- a/app/src/main/res/layout/layout_main.xml +++ b/app/src/main/res/layout/layout_main.xml @@ -30,7 +30,7 @@ android:visibility="invisible" app:layout_anchor="@+id/fab" app:layout_anchorGravity="center" - app:layout_behavior=".widget.FabProgressBehavior" + app:layout_behavior="io.nekohasekai.sagernet.widget.FabProgressBehavior" app:indicatorColor="?colorMaterial100" app:trackThickness="8dp" app:trackCornerRadius="@dimen/mtrl_progress_track_thickness" /> diff --git a/build.gradle.kts b/build.gradle.kts index fd7b2b6c..b6a06efc 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,7 +3,7 @@ import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id("com.github.ben-manes.versions") version "0.38.0" apply false + id("com.github.ben-manes.versions") version "0.39.0" apply false } buildscript { diff --git a/external/colorpicker/build.gradle b/external/colorpicker/build.gradle index 495df2f5..c5c5319f 100644 --- a/external/colorpicker/build.gradle +++ b/external/colorpicker/build.gradle @@ -18,6 +18,6 @@ android { dependencies { api 'androidx.appcompat:appcompat:1.3.0' - api 'androidx.recyclerview:recyclerview:1.2.0' + api 'androidx.recyclerview:recyclerview:1.2.1' api project(':external:flexbox') } \ No newline at end of file diff --git a/external/flexbox/build.gradle b/external/flexbox/build.gradle index 08880eda..c159a225 100644 --- a/external/flexbox/build.gradle +++ b/external/flexbox/build.gradle @@ -42,5 +42,5 @@ android { dependencies { compileOnly "androidx.core:core-ktx:1.5.0" - compileOnly "androidx.recyclerview:recyclerview:1.2.0" + compileOnly "androidx.recyclerview:recyclerview:1.2.1" } diff --git a/sager.properties b/sager.properties index 4aefe506..81e9a5b7 100644 --- a/sager.properties +++ b/sager.properties @@ -1,6 +1,6 @@ PACKAGE_NAME=io.nekohasekai.sagernet -VERSION_NAME=0.1-rc19 -VERSION_CODE=46 +VERSION_NAME=0.1-rc20 +VERSION_CODE=47 NAIVE_VERSION_NAME=91.0.4472.77-1 NAIVE_VERSION=2