From 788c70114287306db20e9a4539018d6e32fb5cb7 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 19 四月 2024 10:10:10 +0800
Subject: [PATCH] Merge branch 'wjc_new' into develop_new
---
app/build.gradle | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 0132905..75aeb39 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -28,14 +28,14 @@
defaultConfig {
applicationId "com.hdl.photovoltaic"
minSdk 23
- targetSdk 30
+ targetSdk 28
versionCode 1
versionName "1.3.2"//鐗堟湰瑙勫垯1.3鏄骇鍝佸姛鑳借凯浠ｇ敤鐨�,鏈�鍚庝竴浣�0鏄垜浠慨澶峛ug鐢ㄧ殑
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
multiDexEnabled true
manifestPlaceholders = mfph
ndk {
- abiFilters 'x86', 'armeabi-v7a', "arm64-v8a" //涓嶆敮鎸乤rmeabi
+ abiFilters 'armeabi-v7a', "arm64-v8a" //涓嶆敮鎸乤rmeabi
}
manifestPlaceholders = [
@@ -61,6 +61,10 @@
]
+ }
+ // 淇濊瘉鍏朵粬鐨刲ib娌℃湁琚玴reDex
+ dexOptions {
+ preDexLibraries = false
}
repositories {
flatDir {
@@ -179,6 +183,8 @@
+
+
//鑻ヤ笉闆嗘垚鍘傚晢閫氶亾锛屽彲鐩存帴璺宠繃浠ヤ笅渚濊禆
// 鏋佸厜鍘傚晢鎻掍欢鐗堟湰涓庢帴鍏� JPush 鐗堟湰淇濇寔涓�鑷达紝涓嬪悓
// 鎺ュ叆鍗庝负鍘傚晢
--
Gitblit v1.8.0