Skip to content

Upgrade gradle version #172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
upgle merged 5 commits into from
Aug 3, 2022
Merged

Upgrade gradle version #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
85818a7
Use jcenter together
ningyougang Aug 2, 2022
0f9ca5e
Solve issue: note: module requires Go 1.18
ningyougang Aug 2, 2022
39e1003
Upgrade gradle to 6.9.1
ningyougang Aug 2, 2022
c0731bc
Fix junit issue
ningyougang Aug 3, 2022
6237f30
Fix test case error
ningyougang Aug 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
buildscript {
repositories {
jcenter()
mavenCentral()
Copy link
Contributor Author

@ningyougang ningyougang Aug 3, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix
image
scalafmt-core is deprecated in jcenter, should use mavenCentral()
And need to keep jcenter() due to exist some lib needs this

}
dependencies {
classpath "cz.alenkacz:gradle-scalafmt:${gradle.scalafmt.version}"
Expand Down
2 changes: 1 addition & 1 deletion golang1.17/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ RUN echo "deb http://deb.debian.org/debian buster-backports main contrib non-fre
librdkafka-dev=0.11.6-1.1 &&\
# Cleanup apt data, we do not need them later on.
apt-get clean && rm -rf /var/lib/apt/lists/* &&\
go get -u github.com/go-delve/delve/cmd/dlv@v1.8.1 &&\
go install github.com/go-delve/delve/cmd/dlv@v1.8.1 &&\
Copy link
Contributor Author

@ningyougang ningyougang Aug 3, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix issue

go get: installing executables with 'go get' in module mode is deprecated.
	Use 'go install pkg@version' instead.
	For more information, see https://golang.org/doc/go-get-install-deprecation
	or run 'go help get' or 'go help install'.
# github.com/rivo/uniseg
pkg/mod/github.com/rivo/uniseg@v0.3.1/properties.go:130:6: missing function body
pkg/mod/github.com/rivo/uniseg@v0.3.1/properties.go:130:20: syntax error: unexpected [, expecting (
note: module requires Go 1.18

mkdir /action

WORKDIR /action
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
4 changes: 2 additions & 2 deletions gradlew
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions gradlew.bat
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion openwhisk/runHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ func (ap *ActionProxy) runHandler(w http.ResponseWriter, r *http.Request) {
var objmap map[string]*json.RawMessage
err = json.Unmarshal(response, &objmap)
if err != nil {
sendError(w, http.StatusBadGateway, "The action did not return a dictionary.")
sendError(w, http.StatusBadGateway, "The action did not return a dictionary or array.")
return
}

Expand Down
9 changes: 6 additions & 3 deletions tests/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,12 @@ tasks.withType(Test) {
}

dependencies {
compile "org.scala-lang:scala-library:${gradle.scala.version}"
compile "org.apache.openwhisk:openwhisk-tests:${gradle.openwhisk.version}:tests"
compile "org.apache.openwhisk:openwhisk-tests:${gradle.openwhisk.version}:test-sources"
implementation "junit:junit:4.11"
implementation "org.scala-lang:scala-library:${gradle.scala.version}"
implementation "org.scalatest:scalatest_${gradle.scala.depVersion}:3.0.8"
implementation "org.apache.openwhisk:openwhisk-common:${gradle.openwhisk.version}"
implementation "org.apache.openwhisk:openwhisk-tests:${gradle.openwhisk.version}:tests"
implementation "org.apache.openwhisk:openwhisk-tests:${gradle.openwhisk.version}:test-sources"
implementation group: 'com.typesafe.akka', name: "akka-http2-support_${gradle.scala.depVersion}", version: "${gradle.akka_http.version}"
implementation group: 'com.typesafe.akka', name: "akka-http-xml_${gradle.scala.depVersion}", version: "${gradle.akka_http.version}"
implementation group: 'com.typesafe.akka', name: "akka-discovery_${gradle.scala.depVersion}", version: "${gradle.akka.version}"
Expand Down