Browse Source

1.修改app版本配置和签名,

master
wangwanlei 8 months ago
parent
commit
49ccba2b96

+ 35
- 2
app/build.gradle.kts View File

1
+@file:Suppress("CAST_NEVER_SUCCEEDS")
2
+
1
 @Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
3
 @Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
2
 plugins {
4
 plugins {
3
     alias(libs.plugins.androidApplication)
5
     alias(libs.plugins.androidApplication)
10
 
12
 
11
     defaultConfig {
13
     defaultConfig {
12
         applicationId = "com.xhly.manageapp"
14
         applicationId = "com.xhly.manageapp"
13
-        minSdk = 24
15
+        minSdk = 26
14
         targetSdk = 30
16
         targetSdk = 30
15
         versionCode = 1
17
         versionCode = 1
16
         versionName = "1.0"
18
         versionName = "1.0"
23
     viewBinding{
25
     viewBinding{
24
         enable=true
26
         enable=true
25
     }
27
     }
28
+
29
+
30
+    signingConfigs {
31
+        create("keystore") {
32
+            keyAlias = "xinghuo"
33
+            keyPassword = "xhkjedu"
34
+            storeFile = file("xinghuo.keystore")
35
+            storePassword = "xhkjedu"
36
+        }
37
+    }
38
+
26
     buildTypes {
39
     buildTypes {
27
-        release {
40
+     /*   release {
41
+            isMinifyEnabled = false
42
+            proguardFiles(
43
+                getDefaultProguardFile("proguard-android-optimize.txt"),
44
+                "proguard-rules.pro"
45
+            )
46
+        }*/
47
+        val signConfig=signingConfigs.getByName("keystore")
48
+        getByName("release") {
28
             isMinifyEnabled = false
49
             isMinifyEnabled = false
29
             proguardFiles(
50
             proguardFiles(
30
                 getDefaultProguardFile("proguard-android-optimize.txt"),
51
                 getDefaultProguardFile("proguard-android-optimize.txt"),
31
                 "proguard-rules.pro"
52
                 "proguard-rules.pro"
32
             )
53
             )
54
+            signingConfig=signConfig
55
+        }
56
+        getByName("debug") {
57
+            isMinifyEnabled = false
58
+            proguardFiles(
59
+                getDefaultProguardFile("proguard-android-optimize.txt"),
60
+                "proguard-rules.pro"
61
+            )
62
+            signingConfig=signConfig
33
         }
63
         }
34
     }
64
     }
35
     compileOptions {
65
     compileOptions {
50
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
80
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
51
         }
81
         }
52
     }
82
     }
83
+    lint {
84
+        abortOnError=false
85
+    }
53
 }
86
 }
54
 
87
 
55
 dependencies {
88
 dependencies {

+ 1
- 2
app/src/main/AndroidManifest.xml View File

34
         android:name=".ManageApplication"
34
         android:name=".ManageApplication"
35
         android:allowBackup="true"
35
         android:allowBackup="true"
36
         android:appComponentFactory="androidx.core.app.CoreComponentFactory"
36
         android:appComponentFactory="androidx.core.app.CoreComponentFactory"
37
-        android:dataExtractionRules="@xml/data_extraction_rules"
38
         android:fullBackupContent="@xml/backup_rules"
37
         android:fullBackupContent="@xml/backup_rules"
39
         android:icon="@mipmap/ic_launcher"
38
         android:icon="@mipmap/ic_launcher"
40
         android:label="@string/app_name"
39
         android:label="@string/app_name"
42
         android:roundIcon="@mipmap/ic_launcher_round"
41
         android:roundIcon="@mipmap/ic_launcher_round"
43
         android:supportsRtl="true"
42
         android:supportsRtl="true"
44
         android:theme="@style/MyStyle"
43
         android:theme="@style/MyStyle"
45
-        tools:targetApi="31">
44
+        tools:targetApi="30">
46
         <meta-data
45
         <meta-data
47
             android:name="design_width_in_dp"
46
             android:name="design_width_in_dp"
48
             android:value="853" />
47
             android:value="853" />

+ 2
- 2
corelib/build.gradle.kts View File

9
     compileSdk = 33
9
     compileSdk = 33
10
 
10
 
11
     defaultConfig {
11
     defaultConfig {
12
-        minSdk = 24
12
+        minSdk = 26
13
 
13
 
14
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
14
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
15
         consumerProguardFiles("consumer-rules.pro")
15
         consumerProguardFiles("consumer-rules.pro")
43
     implementation(libs.core.ktx)
43
     implementation(libs.core.ktx)
44
     implementation(libs.appcompat)
44
     implementation(libs.appcompat)
45
     implementation(libs.material)
45
     implementation(libs.material)
46
-    api(files("libs\\csdk_5.0.jar"))
46
+    api(files("libs\\csdk_XH_505F_Q_0410.jar"))
47
     testImplementation(libs.junit)
47
     testImplementation(libs.junit)
48
     androidTestImplementation(libs.androidx.test.ext.junit)
48
     androidTestImplementation(libs.androidx.test.ext.junit)
49
     androidTestImplementation(libs.espresso.core)
49
     androidTestImplementation(libs.espresso.core)

+ 6
- 1
gradle.properties View File

20
 # Enables namespacing of each library's R class so that its R class includes only the
20
 # Enables namespacing of each library's R class so that its R class includes only the
21
 # resources declared in the library itself and none from the library's dependencies,
21
 # resources declared in the library itself and none from the library's dependencies,
22
 # thereby reducing the size of the R class for that library
22
 # thereby reducing the size of the R class for that library
23
-android.nonTransitiveRClass=true
23
+android.nonTransitiveRClass=true
24
+
25
+RELEASE_KEY_PASSWORD=xhkjedu
26
+RELEASE_KEY_ALIAS=xinghuo
27
+RELEASE_STORE_PASSWORD=xhkjedu
28
+RELEASE_STORE_FILE=xinghuo.keystore

+ 1
- 1
websocket/build.gradle.kts View File

9
     compileSdk = 33
9
     compileSdk = 33
10
 
10
 
11
     defaultConfig {
11
     defaultConfig {
12
-        minSdk = 24
12
+        minSdk = 26
13
 
13
 
14
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
14
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
15
         consumerProguardFiles("consumer-rules.pro")
15
         consumerProguardFiles("consumer-rules.pro")

Loading…
Cancel
Save