Browse Source

Refine project struct

世界 4 years ago
parent
commit
52b949106a

+ 1 - 0
.idea/gradle.xml

@@ -78,6 +78,7 @@
             <option value="$PROJECT_DIR$/library/proto-stub" />
             <option value="$PROJECT_DIR$/library/shadowsocks" />
             <option value="$PROJECT_DIR$/library/shadowsocks-libev" />
+            <option value="$PROJECT_DIR$/library/stub" />
             <option value="$PROJECT_DIR$/plugin" />
             <option value="$PROJECT_DIR$/plugin/api" />
             <option value="$PROJECT_DIR$/plugin/brook" />

+ 2 - 1
app/build.gradle.kts

@@ -30,7 +30,8 @@ android {
 dependencies {
 
     implementation(fileTree("libs"))
-    compileOnly(project(":library:include"))
+    compileOnly(project(":library:stub"))
+    implementation(project(":library:include"))
 
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2")
     implementation("androidx.core:core-ktx:1.6.0")

+ 5 - 1
library/include/build.gradle.kts

@@ -2,4 +2,8 @@ plugins {
     id("com.android.library")
 }
 
-setupCommon()
+setupCommon()
+
+dependencies {
+    implementation("androidx.annotation:annotation:1.2.0")
+}

+ 1 - 1
library/include/src/main/AndroidManifest.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.android.include" />
+<manifest package="com.android.stub" />

+ 0 - 0
app/src/main/java/com/wireguard/crypto/Curve25519.java → library/include/src/main/java/com.wireguard/crypto/Curve25519.java


+ 0 - 0
app/src/main/java/com/wireguard/crypto/Ed25519.java → library/include/src/main/java/com.wireguard/crypto/Ed25519.java


+ 0 - 0
app/src/main/java/com/wireguard/crypto/Key.java → library/include/src/main/java/com.wireguard/crypto/Key.java


+ 0 - 0
app/src/main/java/com/wireguard/crypto/KeyFormatException.java → library/include/src/main/java/com.wireguard/crypto/KeyFormatException.java


+ 0 - 0
app/src/main/java/com/wireguard/crypto/KeyPair.java → library/include/src/main/java/com.wireguard/crypto/KeyPair.java


+ 0 - 0
app/src/main/java/java/nio/charset/StandardCharsets.java → library/include/src/main/java/java/nio/charset/StandardCharsets.java


+ 0 - 0
app/src/main/java/java/nio/file/Path.java → library/include/src/main/java/java/nio/file/Path.java


+ 5 - 0
library/stub/build.gradle.kts

@@ -0,0 +1,5 @@
+plugins {
+    id("com.android.library")
+}
+
+setupCommon()

+ 2 - 0
library/stub/src/main/AndroidManifest.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.android.include" />

+ 0 - 0
library/include/src/main/java/android/net/NetworkUtils.java → library/stub/src/main/java/android/net/NetworkUtils.java


+ 0 - 0
library/include/src/main/java/sun/misc/Unsafe.java → library/stub/src/main/java/sun/misc/Unsafe.java


+ 4 - 4
settings.gradle.kts

@@ -1,10 +1,11 @@
+include(":library:stub")
 include(":library:include")
-include(":library:shadowsocks")
-include(":library:shadowsocks-libev")
-
 include(":library:proto")
 include(":library:proto-stub")
 
+include(":library:shadowsocks")
+include(":library:shadowsocks-libev")
+
 include(":plugin:api")
 
 val buildPlugin = System.getenv("BUILD_PLUGIN")
@@ -26,7 +27,6 @@ when {
     }
 }
 
-
 include(":external:preferencex:preferencex")
 include(":external:preferencex:preferencex-simplemenu")
 include(":external:preferencex:flexbox")