Skip to content

Commit af65077

Browse files
committed
Update Gradle 7.5.1
1 parent 3b8293b commit af65077

File tree

6 files changed

+15
-6
lines changed

6 files changed

+15
-6
lines changed

matrix/matrix-android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ buildscript {
88

99
}
1010

11-
gradle.ext.KOTLIN_VERSION = "1.4.32"
11+
gradle.ext.KOTLIN_VERSION = "1.6.21"
1212

1313
dependencies {
1414
// classpath

matrix/matrix-android/gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryErro
1414
# org.gradle.parallel=true
1515
#Tue Jun 20 10:24:33 CST 2017
1616

17-
VERSION_NAME_PREFIX=2.1.0
17+
VERSION_NAME_PREFIX=2.1.1
1818
VERSION_NAME_SUFFIX=
1919
## two options: Internal (for wechat), External (for public repo)
20-
PUBLISH_CHANNEL=Internal
20+
PUBLISH_CHANNEL=External
2121
android.useAndroidX=true

matrix/matrix-android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip

matrix/matrix-android/matrix-apk-canary/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ project.afterEvaluate {
2222
}
2323

2424
jar {
25+
duplicatesStrategy(DuplicatesStrategy.EXCLUDE)
26+
2527
manifest {
2628
attributes 'Main-Class': 'com.tencent.matrix.apk.ApkChecker'
2729
attributes 'Manifest-Version': version
@@ -40,7 +42,7 @@ jar {
4042
exclude 'META-INF/*.SF'
4143
exclude 'META-INF/*.DSA'
4244
exclude 'META-INF/*.RSA'
43-
configurations.runtime.resolve().collect {
45+
configurations.runtimeClasspath.resolve().collect {
4446
it.isDirectory() ? it : zipTree(it)
4547
}
4648
}

matrix/matrix-android/matrix-gradle-plugin/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ dependencies {
1111
implementation project(':matrix-arscutil')
1212
implementation "org.jetbrains.kotlin:kotlin-stdlib:${gradle.KOTLIN_VERSION}"
1313
}
14+
15+
processResources {
16+
duplicatesStrategy(DuplicatesStrategy.EXCLUDE)
17+
}
18+
1419
sourceSets {
1520
main {
1621
java {

matrix/matrix-android/matrix-resource-canary/matrix-resource-canary-analyzer-cli/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ project.afterEvaluate {
1212
}
1313

1414
jar {
15+
duplicatesStrategy(DuplicatesStrategy.EXCLUDE)
16+
1517
manifest {
1618
attributes 'Main-Class': 'com.tencent.matrix.resource.analyzer.CLIMain'
1719
attributes 'Manifest-Version': archiveVersion
@@ -30,7 +32,7 @@ jar {
3032
exclude 'META-INF/*.SF'
3133
exclude 'META-INF/*.DSA'
3234
exclude 'META-INF/*.RSA'
33-
configurations.runtime.resolve().collect {
35+
configurations.runtimeClasspath.resolve().collect {
3436
it.isDirectory() ? it : zipTree(it)
3537
}
3638
}

0 commit comments

Comments
 (0)