Update gradle

cbeuw · Jun 29, 2024 · 38f2573 · 38f2573
1 parent 5a5df0a
commit 38f2573
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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/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