Merge pull request #21 from shadowsocks/plugin-1.3.4
Change ID to v2ray-plugin with back compatibility
This commit is contained in:
commit
cde826be2d
4 changed files with 20 additions and 4 deletions
|
@ -17,8 +17,15 @@ def getCurrentFlavor() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
def javaVersion = JavaVersion.VERSION_1_8
|
||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdkVersion 29
|
compileSdkVersion 29
|
||||||
|
compileOptions {
|
||||||
|
sourceCompatibility javaVersion
|
||||||
|
targetCompatibility javaVersion
|
||||||
|
}
|
||||||
|
kotlinOptions.jvmTarget = javaVersion
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId "com.github.shadowsocks.plugin.v2ray"
|
applicationId "com.github.shadowsocks.plugin.v2ray"
|
||||||
minSdkVersion rootProject.minSdkVersion
|
minSdkVersion rootProject.minSdkVersion
|
||||||
|
@ -64,7 +71,7 @@ tasks.whenTaskAdded { task ->
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
||||||
implementation 'androidx.preference:preference:1.1.0'
|
implementation 'androidx.preference:preference:1.1.0'
|
||||||
implementation 'com.github.shadowsocks:plugin:1.3.3'
|
implementation 'com.github.shadowsocks:plugin:1.3.4'
|
||||||
implementation 'com.takisoft.preferencex:preferencex-simplemenu:1.1.0'
|
implementation 'com.takisoft.preferencex:preferencex-simplemenu:1.1.0'
|
||||||
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
|
||||||
testImplementation 'junit:junit:4.13'
|
testImplementation 'junit:junit:4.13'
|
||||||
|
|
|
@ -20,9 +20,17 @@
|
||||||
<action android:name="com.github.shadowsocks.plugin.ACTION_NATIVE_PLUGIN"/>
|
<action android:name="com.github.shadowsocks.plugin.ACTION_NATIVE_PLUGIN"/>
|
||||||
<data android:scheme="plugin"
|
<data android:scheme="plugin"
|
||||||
android:host="com.github.shadowsocks"
|
android:host="com.github.shadowsocks"
|
||||||
android:pathPrefix="/v2ray"/>
|
android:path="/v2ray"/>
|
||||||
|
</intent-filter>
|
||||||
|
<intent-filter>
|
||||||
|
<action android:name="com.github.shadowsocks.plugin.ACTION_NATIVE_PLUGIN"/>
|
||||||
|
<data android:scheme="plugin"
|
||||||
|
android:host="com.github.shadowsocks"
|
||||||
|
android:path="/v2ray-plugin"/>
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
<meta-data android:name="com.github.shadowsocks.plugin.id"
|
<meta-data android:name="com.github.shadowsocks.plugin.id"
|
||||||
|
android:value="v2ray-plugin"/>
|
||||||
|
<meta-data android:name="com.github.shadowsocks.plugin.id.aliases"
|
||||||
android:value="v2ray"/>
|
android:value="v2ray"/>
|
||||||
<meta-data android:name="com.github.shadowsocks.plugin.executable_path"
|
<meta-data android:name="com.github.shadowsocks.plugin.executable_path"
|
||||||
android:value="libv2ray.so"/>
|
android:value="libv2ray.so"/>
|
||||||
|
@ -34,7 +42,7 @@
|
||||||
<category android:name="android.intent.category.DEFAULT"/>
|
<category android:name="android.intent.category.DEFAULT"/>
|
||||||
<data android:scheme="plugin"
|
<data android:scheme="plugin"
|
||||||
android:host="com.github.shadowsocks"
|
android:host="com.github.shadowsocks"
|
||||||
android:path="/v2ray"/>
|
android:path="/v2ray-plugin"/>
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
</activity>
|
</activity>
|
||||||
</application>
|
</application>
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit ca361195f584f3904c9440ac012bd4e8611f7b52
|
Subproject commit 59b8f4fc46c7be399dad0620121a89efa656dc9c
|
|
@ -22,6 +22,7 @@ allprojects {
|
||||||
repositories {
|
repositories {
|
||||||
google()
|
google()
|
||||||
jcenter()
|
jcenter()
|
||||||
|
mavenLocal()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue