From c660f059d4e07a1b784442a1bbb4a5109b82e837 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 25 六月 2024 09:51:45 +0800
Subject: [PATCH] Merge branch 'dev' of http://172.16.1.23:6688/r/~wjc/HDLPhotovoltaicDebugAPP into dev
---
app/build.gradle | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 9870691..450c492 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -24,13 +24,13 @@
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鐢ㄧ殑
+ versionName "1.4.1"//鐗堟湰瑙勫垯1.3鏄骇鍝佸姛鑳借凯浠ｇ敤鐨�,鏈�鍚庝竴浣�0鏄垜浠慨澶峛ug鐢ㄧ殑
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
multiDexEnabled true
manifestPlaceholders = mfph
@@ -77,6 +77,14 @@
//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
+// }
+
+
/**
* 鎵撳寘鑷姩鍛藉悕
*/
--
Gitblit v1.8.0