diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 140ae35..9f3e573 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -29,7 +29,7 @@ jobs: link-to-sdk: true - name: Build with Gradle - run: ./gradlew assembleRelease + run: ./gradlew --no-daemon assembleRelease - name: Sign APK id: sign_app diff --git a/app/build.gradle b/app/build.gradle index d537835..a85a87e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,7 +11,7 @@ android { 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 +22,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 index 5bdbf3b..3d68a88 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools"> - + diff --git a/build.gradle b/build.gradle index 73408b6..a0ff85d 100644 --- 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 index 91f284b..83693b1 100644 --- 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