From 3fd0823bf0013682bb5ab398c25dea35152ba07a Mon Sep 17 00:00:00 2001
From: Shatyuka <958182453@qq.com>
Date: Wed, 21 Jun 2023 22:49:47 +0800
Subject: [PATCH] [skip ci] Bump version

---
 app/build.gradle                 | 22 ++++++++++++----------
 app/src/main/AndroidManifest.xml |  3 +--
 build.gradle                     |  2 +-
 gradle.properties                |  4 ++--
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 943c8ea..46e2a74 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,7 +1,9 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 33
+    namespace 'com.shatyuka.zhiliao'
+    compileSdk 33
+    buildToolsVersion '33.0.2'
     defaultConfig {
         applicationId "com.shatyuka.zhiliao"
         minSdkVersion 26
@@ -28,16 +30,16 @@ android {
             }
         }
     }
-    applicationVariants.all { variant ->
+    applicationVariants.configureEach { variant ->
         variant.resValue "string", "app_version", variant.versionName
-        variant.outputs.all { output ->
+        variant.outputs.configureEach { output ->
             if (variant.buildType.name == 'release') {
                 outputFileName = "Zhiliao_${defaultConfig.versionName}.apk"
             }
         }
     }
     buildTypes {
-        all {
+        configureEach {
             if (project.hasProperty('releaseStoreFile')) {
                 signingConfig signingConfigs.config
             } else {
@@ -74,13 +76,13 @@ android {
     buildFeatures {
         prefab true
     }
-    buildToolsVersion '33.0.2'
-
     packagingOptions {
-        exclude 'META-INF/**'
-        exclude 'kotlin/**'
-        exclude 'google/**'
-        exclude '**.bin'
+        jniLibs {
+            excludes += ['META-INF/**', 'kotlin/**', 'google/**']
+        }
+        resources {
+            excludes += ['META-INF/**', 'kotlin/**', 'google/**', '**.bin']
+        }
     }
 }
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b1ba1a2..3912b6a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.shatyuka.zhiliao">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
diff --git a/build.gradle b/build.gradle
index c40eca5..d4c4979 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,6 +21,6 @@ allprojects {
     }
 }
 
-task clean(type: Delete) {
+tasks.register('clean', Delete) {
     delete rootProject.buildDir
 }
diff --git a/gradle.properties b/gradle.properties
index aeb914e..2b78712 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,5 +16,5 @@ android.experimental.enableNewResourceShrinker.preciseShrinking=true
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-appVerName=23.03.25
-appVerCode=202303250
+appVerName=23.06.21
+appVerCode=202306210