cbeuw · cbeuw · Jun 29, 2024 · Jun 29, 2024 · Jun 29, 2024 · Jun 29, 2024
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -0,0 +1,65 @@
+name: Release APK
+
+on: push
+
+permissions:
+  id-token: write
+  attestations: write
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Set up Go
+      uses: actions/setup-go@v5.0.1
+      with:
+        go-version: '1.22'
+
+    - name: Set up JDK 17
+      uses: actions/setup-java@v3
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+
+    - name: Set up Android SDK
+      uses: android-actions/setup-android@v3
+
+    - name: Set up NDK
+      uses: nttld/setup-ndk@v1
+      with:
+        ndk-version: r26d
+        link-to-sdk: true
+
+    - name: Compile Go libs
+      run: |
+        pushd 'app/src'
+        ./make.sh
+        popd
+
+    - name: Build with Gradle
+      run: ./gradlew --no-daemon assembleRelease
+
+    - name: Sign APK
+      id: sign_app
+      uses: r0adkll/sign-android-release@v1
+      with:
+        releaseDirectory: app/build/outputs/apk/release
+        signingKeyBase64: ${{ secrets.SIGNING_KEY }}
+        keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
+        alias: ${{ secrets.ALIAS }}
+      env:
+        BUILD_TOOLS_VERSION: "34.0.0"
+
+    - name: Attest APK
+      uses: actions/attest-build-provenance@v1
+      with:
+        subject-path: ${{steps.sign_app.outputs.signedReleaseFile}}
+
+    - name: Upload release files
+      uses: softprops/action-gh-release@v2
+      if: startsWith(github.ref, 'refs/tags/')
+      with:
+        files: ${{steps.sign_app.outputs.signedReleaseFile}}
+
diff --git a/README.md b/README.md
@@ -3,10 +3,10 @@ Shadowsocks plugin Cloak for Android
 
 ## Requirements
 
-- Go 1.15
-- Android NDK 21.3.6528147
-- Android SDK 29
-- Gradle 6.1.1
+- Go 1.22
+- Android NDK 26.3.11579264
+- Android SDK 34
+- Gradle 7.4
 
 ## Build Instructions
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -6,12 +6,13 @@ apply plugin: 'kotlin-android-extensions'
 
 
 android {
-    compileSdkVersion 29
+    compileSdk 34
+    buildToolsVersion "34.0.0"
     ndkVersion "21.3.6528147"
     defaultConfig {
         applicationId "com.github.shadowsocks.plugin.ck_client"
         minSdkVersion 21
-        targetSdkVersion 29
+        targetSdkVersion 34
         versionCode 22
         versionName '2.9.0'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -22,6 +23,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    namespace 'com.github.shadowsocks.plugin.ck_client'
     applicationVariants.all { variant ->
         variant.outputs.all {
             outputFileName = "ck-client-${defaultConfig.versionName}.apk"

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.github.shadowsocks.plugin.ck_client">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application
         tools:replace="android:theme"
@@ -32,7 +31,8 @@
                 android:name="com.github.shadowsocks.plugin.default_config"
                 android:value="" />
         </provider>
-        <activity android:name="com.github.shadowsocks.plugin.ck_client.ConfigActivity">
+        <activity android:name="com.github.shadowsocks.plugin.ck_client.ConfigActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="com.github.shadowsocks.plugin.ACTION_CONFIGURE" />
                 <category android:name="android.intent.category.DEFAULT" />

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
diff --git a/build.gradle b/build.gradle
@@ -1,14 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.72'
+    ext.kotlin_version = '1.6.21'
     repositories {
         google()
         jcenter()
         maven { url "https://jitpack.io" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.1'
+        classpath 'com.android.tools.build:gradle:7.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Apr 17 15:34:59 BST 2021
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+#Sat Jun 29 18:03:17 BST 2024
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists