Commit 1bade55d authored by pengjunjign's avatar pengjunjign

Merge remote-tracking branch 'origin/aar_pkg' into dev

# Conflicts:
#	build.gradle
parents 5c987827 c453f2e9
......@@ -28,3 +28,6 @@
-keep class com.hianalytics.android.**{*;}
-keep class com.huawei.updatesdk.**{*;}
-keep class com.huawei.hms.**{*;}
您的密钥库包含 1 个条目
别名: test_key
创建日期: 2021-5-18
条目类型: PrivateKeyEntry
证书链长度: 1
证书[1]:
所有者: CN=test_key
发布者: CN=test_key
序列号: 43af9e16
生效时间: Tue May 18 15:26:59 CST 2021, 失效时间: Sat May 12 15:26:59 CST 2046
证书指纹:
SHA1: AD:29:C0:E9:34:F5:4A:72:37:8D:6B:EF:7A:79:DC:AE:79:15:65:15
SHA256: 8E:48:F2:B3:7B:42:6E:19:72:58:91:02:5F:0C:23:24:20:01:86:F4:22:69:3A:2C:C1:53:63:FB:22:15:D8:2A
签名算法名称: SHA256withRSA
主体公共密钥算法: 2048 位 RSA 密钥
版本: 3
扩展:
#1: ObjectId: 2.5.29.14 Criticality=false
SubjectKeyIdentifier [
KeyIdentifier [
0000: D7 B4 FB 72 1F AD ED C0 A3 3E 31 6A C1 9D 6E 7E ...r.....>1j..n.
0010: 22 4F F4 8C "O..
]
]
\ No newline at end of file
......@@ -3,18 +3,16 @@ import java.text.SimpleDateFormat
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.kotlin_version = '1.3.72'
ext.kotlin_version = '1.5.0'
repositories {
maven { url 'https://developer.huawei.com/repo/' }
jcenter()
google()
mavenCentral()
maven { url 'https://developer.huawei.com/repo/' }
}
dependencies {
classpath "com.android.tools.build:gradle:4.2.1"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// classpath 'com.huawei.agconnect:agcp:1.3.1.300'
classpath 'com.huawei.agconnect:agcp:1.4.2.300'
classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.15.2"
......@@ -23,10 +21,9 @@ buildscript {
allprojects {
repositories {
maven { url 'https://developer.huawei.com/repo/' }
jcenter()
google()
mavenCentral()
maven { url 'https://developer.huawei.com/repo/' }
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment