Skip to content

Commit 0aaa804

Browse files
committed
Update dependencies
1 parent e8cd1f3 commit 0aaa804

File tree

9 files changed

+128
-121
lines changed

9 files changed

+128
-121
lines changed

app/build.gradle

Lines changed: 0 additions & 88 deletions
This file was deleted.

app/build.gradle.kts

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
import com.android.build.gradle.internal.api.ApkVariantOutputImpl
2+
import com.android.build.VariantOutput
3+
import org.apache.tools.ant.taskdefs.condition.Os
4+
import java.util.Locale
5+
6+
plugins {
7+
id("com.android.application")
8+
kotlin("android")
9+
}
10+
11+
val flavorRegex = "(assemble|generate)\\w*(Release|Debug)".toRegex()
12+
val currentFlavor get() = gradle.startParameter.taskRequests.toString().let { task ->
13+
flavorRegex.find(task)?.groupValues?.get(2)?.toLowerCase(Locale.ROOT) ?: "debug".also {
14+
println("Warning: No match found for $task")
15+
}
16+
}
17+
18+
val minSdk = 21
19+
20+
android {
21+
val javaVersion = JavaVersion.VERSION_1_8
22+
compileSdkVersion(29)
23+
compileOptions {
24+
sourceCompatibility = javaVersion
25+
targetCompatibility = javaVersion
26+
}
27+
kotlinOptions.jvmTarget = javaVersion.toString()
28+
defaultConfig {
29+
applicationId = "com.github.shadowsocks.plugin.v2ray"
30+
minSdkVersion(minSdk)
31+
targetSdkVersion(29)
32+
versionCode = 1030100
33+
versionName = "1.3.1"
34+
testInstrumentationRunner = "android.support.test.runner.AndroidJUnitRunner"
35+
}
36+
buildTypes {
37+
getByName("release") {
38+
isShrinkResources = true
39+
isMinifyEnabled = true
40+
proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
41+
}
42+
}
43+
splits {
44+
abi {
45+
isEnable = true
46+
isUniversalApk = true
47+
}
48+
}
49+
sourceSets.getByName("main") {
50+
jniLibs.setSrcDirs(jniLibs.srcDirs + files("$projectDir/build/go"))
51+
}
52+
}
53+
54+
tasks.register<Exec>("goBuild") {
55+
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
56+
println("Warning: Building on Windows is not supported")
57+
} else {
58+
executable("/bin/bash")
59+
args("go-build.bash", minSdk)
60+
environment("ANDROID_HOME", android.sdkDirectory)
61+
environment("ANDROID_NDK_HOME", android.ndkDirectory)
62+
}
63+
}
64+
65+
tasks.whenTaskAdded {
66+
when (name) {
67+
"mergeDebugJniLibFolders", "mergeReleaseJniLibFolders" -> dependsOn("goBuild")
68+
}
69+
}
70+
71+
dependencies {
72+
implementation(kotlin("stdlib-jdk8", rootProject.extra.get("kotlinVersion").toString()))
73+
implementation("androidx.preference:preference:1.1.1")
74+
implementation("com.github.shadowsocks:plugin:1.3.4")
75+
implementation("com.takisoft.preferencex:preferencex-simplemenu:1.1.0")
76+
testImplementation("junit:junit:4.13")
77+
androidTestImplementation("androidx.test:runner:1.2.0")
78+
androidTestImplementation("androidx.test.espresso:espresso-core:3.2.0")
79+
}
80+
81+
val abiCodes = mapOf("armeabi-v7a" to 1, "arm64-v8a" to 2, "x86" to 3, "x86_64" to 4)
82+
if (currentFlavor == "release") android.applicationVariants.all {
83+
for (output in outputs) {
84+
abiCodes[(output as ApkVariantOutputImpl).getFilter(VariantOutput.ABI)]?.let { offset ->
85+
output.versionCodeOverride = versionCode + offset
86+
}
87+
}
88+
}

build.gradle

Lines changed: 0 additions & 31 deletions
This file was deleted.

build.gradle.kts

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
// Top-level build file where you can add configuration options common to all sub-projects/modules.
2+
3+
plugins {
4+
id("com.github.ben-manes.versions") version "0.28.0"
5+
}
6+
7+
buildscript {
8+
val kotlinVersion = "1.3.72"
9+
extra.set("kotlinVersion", kotlinVersion)
10+
11+
repositories {
12+
google()
13+
jcenter()
14+
}
15+
dependencies {
16+
classpath("com.android.tools.build:gradle:4.0.0-rc01")
17+
classpath("com.github.ben-manes:gradle-versions-plugin:0.28.0")
18+
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
19+
}
20+
}
21+
22+
allprojects {
23+
repositories {
24+
google()
25+
jcenter()
26+
mavenLocal()
27+
}
28+
}
29+
30+
tasks.register<Delete>("clean") {
31+
delete(rootProject.buildDir)
32+
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

gradlew

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ esac
8282

8383
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
8484

85+
8586
# Determine the Java command to use to start the JVM.
8687
if [ -n "$JAVA_HOME" ] ; then
8788
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
129130
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
130131
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
131132
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
133+
132134
JAVACMD=`cygpath --unix "$JAVACMD"`
133135

134136
# We build the pattern for arguments to be converted via cygpath

gradlew.bat

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
2929
set APP_BASE_NAME=%~n0
3030
set APP_HOME=%DIRNAME%
3131

32+
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
33+
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
34+
3235
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
3336
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
3437

@@ -81,6 +84,7 @@ set CMD_LINE_ARGS=%*
8184

8285
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
8386

87+
8488
@rem Execute Gradle
8589
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
8690

settings.gradle

Lines changed: 0 additions & 1 deletion
This file was deleted.

settings.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
include(":app")

0 commit comments

Comments
 (0)