From d5def3bf2f9f39649ca658ac0a1c9db929f8bc4d Mon Sep 17 00:00:00 2001 From: Rurirei <72071920+rurirei@users.noreply.github.com> Date: Tue, 20 Oct 2020 07:06:36 +0800 Subject: [PATCH 1/5] useless anko --- V2rayNG/app/proguard-rules.pro | 3 --- 1 file changed, 3 deletions(-) diff --git a/V2rayNG/app/proguard-rules.pro b/V2rayNG/app/proguard-rules.pro index e56daed3..c088e544 100644 --- a/V2rayNG/app/proguard-rules.pro +++ b/V2rayNG/app/proguard-rules.pro @@ -44,9 +44,6 @@ static void throwUninitializedPropertyAccessException(java.lang.String); } --dontwarn org.jetbrains.anko.internals.** --keep class org.jetbrains.anko.internals.** { *;} - -dontwarn rx.internal.util.unsafe.** -keep class rx.internal.util.unsafe.** { *;} From 49b682f0f30d261432fe50910d7be15e8a82176a Mon Sep 17 00:00:00 2001 From: Rurirei <72071920+rurirei@users.noreply.github.com> Date: Tue, 20 Oct 2020 07:10:19 +0800 Subject: [PATCH 2/5] target 30 * update dependencies --- V2rayNG/build.gradle | 2 +- V2rayNG/gradle.properties | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/V2rayNG/build.gradle b/V2rayNG/build.gradle index 7b3fdbb2..7615c167 100644 --- a/V2rayNG/build.gradle +++ b/V2rayNG/build.gradle @@ -7,7 +7,7 @@ buildscript { maven { url 'https://maven.google.com' } } dependencies { - classpath 'com.android.tools.build:gradle:4.0.1' + classpath 'com.android.tools.build:gradle:4.1.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" // NOTE: Do not place your application dependencies here; they belong diff --git a/V2rayNG/gradle.properties b/V2rayNG/gradle.properties index cd501cb8..6c31f890 100644 --- a/V2rayNG/gradle.properties +++ b/V2rayNG/gradle.properties @@ -13,9 +13,9 @@ org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryErro # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true #Fri Jun 02 14:08:42 CST 2017 -kotlinVersion=1.4.0 +kotlinVersion=1.4.10 supportLibVersion=28.0.0 -buildToolsVer=29.0.3 -compileSdkVer=29 +buildToolsVer=30.0.2 +compileSdkVer=30 kotlin.incremental=true -targetSdkVer=29 +targetSdkVer=30 From afa0eb937599a054e611a5a6d59303ac3abe4327 Mon Sep 17 00:00:00 2001 From: Rurirei <72071920+rurirei@users.noreply.github.com> Date: Tue, 20 Oct 2020 07:20:37 +0800 Subject: [PATCH 3/5] package visibility --- V2rayNG/app/src/main/AndroidManifest.xml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/V2rayNG/app/src/main/AndroidManifest.xml b/V2rayNG/app/src/main/AndroidManifest.xml index 28d37785..bc377599 100644 --- a/V2rayNG/app/src/main/AndroidManifest.xml +++ b/V2rayNG/app/src/main/AndroidManifest.xml @@ -1,5 +1,6 @@ + + + + @@ -21,6 +27,7 @@ + - - - - From 1c1f130ca79a2c1e00cb56ae0fb29b90cad2e548 Mon Sep 17 00:00:00 2001 From: Rurirei <72071920+rurirei@users.noreply.github.com> Date: Tue, 20 Oct 2020 09:42:48 +0800 Subject: [PATCH 4/5] update badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dc85bac0..6d06316b 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ A V2Ray client for Android [![API](https://img.shields.io/badge/API-17%2B-yellow.svg?style=flat)](https://developer.android.com/about/versions/jelly-bean#android-4.2) -[![Kotlin Version](https://img.shields.io/badge/Kotlin-1.4.0-blue.svg)](https://kotlinlang.org) +[![Kotlin Version](https://img.shields.io/badge/Kotlin-1.4.10-blue.svg)](https://kotlinlang.org) [![GitHub commit activity](https://img.shields.io/github/commit-activity/m/2dust/v2rayNG)](https://github.com/2dust/v2rayNG/commits/master) [![CodeFactor](https://www.codefactor.io/repository/github/2dust/v2rayng/badge)](https://www.codefactor.io/repository/github/2dust/v2rayng) [![GitHub Releases](https://img.shields.io/github/downloads/2dust/v2rayNG/latest/total?logo=github)](https://github.com/2dust/v2rayNG/releases) From ceb29840f27ce149c5cb42ba70db57a6e280ef00 Mon Sep 17 00:00:00 2001 From: Rurirei <72071920+rurirei@users.noreply.github.com> Date: Tue, 20 Oct 2020 09:49:16 +0800 Subject: [PATCH 5/5] BuildTools 30 fix --- .../src/main/kotlin/com/v2ray/ang/service/V2RayVpnService.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/V2RayVpnService.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/V2RayVpnService.kt index a72f0bf1..8387c260 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/V2RayVpnService.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/V2RayVpnService.kt @@ -50,7 +50,7 @@ class V2RayVpnService : VpnService(), ServiceControl { override fun onAvailable(network: Network) { setUnderlyingNetworks(arrayOf(network)) } - override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities?) { + override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities) { // it's a good idea to refresh capabilities setUnderlyingNetworks(arrayOf(network)) }