Skip to content

Commit 8d6169e

Browse files
Merge pull request #457 from yanghang8612/fix_incompatible-deps
fix(deps,gradle): upgrade gradle to v7.6.4 and fix incompatible dependencies
2 parents 9ca71c0 + 0ba4c1b commit 8d6169e

File tree

5 files changed

+30
-13
lines changed

5 files changed

+30
-13
lines changed

sun-sdk/build.gradle

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ apply plugin: 'com.google.protobuf'
66
apply plugin: 'com.github.johnrengelman.shadow'
77
apply plugin: "jacoco"
88

9-
def grpcVersion = '1.60.0'
9+
def grpcVersion = '1.71.0'
1010

1111
sourceCompatibility = 1.8
1212
targetCompatibility = JavaVersion.VERSION_1_8
@@ -53,7 +53,7 @@ buildscript {
5353
}
5454

5555
dependencies {
56-
classpath 'com.github.jengelman.gradle.plugins:shadow:5.2.0'
56+
classpath 'gradle.plugin.com.github.johnrengelman:shadow:7.1.2'
5757
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.9.1'
5858
classpath "gradle.plugin.com.liferay:gradle-plugins-node:4.3.0"
5959
}
@@ -148,5 +148,8 @@ test {
148148
}
149149

150150
shadowJar {
151+
archiveFileName.set("sun-sdk.jar")
151152
mergeServiceFiles()
152153
}
154+
155+
processResources.dependsOn(generateProto) // explicit_dependency
2.36 KB
Binary file not shown.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.4-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-all.zip
4+
networkTimeout=10000
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists

sun-sdk/gradlew

Lines changed: 14 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sun-sdk/gradlew.bat

Lines changed: 9 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)