From 73ac57b92e9a39b0a9ac697c336a25304bc83496 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 12 六月 2024 15:47:31 +0800
Subject: [PATCH] Merge branch 'dev' into feature/v1.4.1

---
 app/build.gradle |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 9870691..e4ab9df 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -24,11 +24,11 @@
             keyPassword '85521566'
         }
     }
-    compileSdk 30
+    compileSdkVersion 31
     defaultConfig {
         applicationId "com.hdl.photovoltaic"
-        minSdk 23
-        targetSdk 30
+        minSdkVersion 23
+        targetSdkVersion 31
         versionCode 1
         versionName "1.4.0"//鐗堟湰瑙勫垯1.3鏄骇鍝佸姛鑳借凯浠ｇ敤鐨�,鏈�鍚庝竴浣�0鏄垜浠慨澶峛ug鐢ㄧ殑
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -77,12 +77,20 @@
         //noCompress 'foo', 'bar'
         ignoreAssetsPattern "!.svn:!.git:.*:!CVS:!thumbs.db:!picasa.ini:!*.scc:*~"
     }
+//    lintOptions {
+//        checkReleaseBuilds false
+//        // Or, if you prefer, you can continue to check for errors in release builds,
+//        // but continue the build even when errors are found:
+//        abortOnError false
+//    }
+
+
     /**
      * 鎵撳寘鑷姩鍛藉悕
      */
     android.applicationVariants.configureEach { variant ->
         variant.outputs.configureEach {
-            outputFileName = "photovoltaic_v${versionName}_${generateTime()}_${getEnvironmentVersion(2)}.apk"
+            outputFileName = "photovoltaic_v${versionName}_${generateTime()}_${getEnvironmentVersion(4)}.apk"
         }
     }
 

--
Gitblit v1.8.0