Skip to content

Commit

Permalink
<sync>(project): sync code from branch 0.8.11. (#36)
Browse files Browse the repository at this point in the history
  • Loading branch information
kyonRay authored Feb 27, 2024
1 parent 11aa72a commit ed68add
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-18.04, ubuntu-20.04, ubuntu-22.04, windows-2019, macos-12]
os: [ubuntu-20.04, ubuntu-22.04, windows-2019, macos-12]
steps:
- uses: actions/checkout@v2
with:
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,7 @@ log**

gradle.properties
gpg.gpg
log4j.properties

## macOS
.DS_Store
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,11 @@ subprojects {
}

dependencies {
compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.32'
compile(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.14.0') {
compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.36'
compile(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.14.3') {
force true
}
compile group: 'com.google.code.gson', name: 'gson', version: '2.9.0'
compile group: 'com.google.code.gson', name: 'gson', version: '2.9.1'

testImplementation group: 'junit', name: 'junit', version: '4.12'
testImplementation group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.32'
Expand Down
2 changes: 1 addition & 1 deletion solc-0.8.11/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
group 'org.fisco-bcos'

archivesBaseName = 'solcJ'
version = '0.8.11.1-SNAPSHOT'
version = '0.8.11.1'

task sourcesJar(type: Jar) {
from sourceSets.main.allJava
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ private void initSolc(boolean sm) {
*/
public static Result compile(File source, boolean sm, boolean combinedJson, Option... options)
throws IOException {
return getInstance().compileSrc(source, sm, true, combinedJson, options);
return getInstance().compileSrc(source, sm, false, combinedJson, options);
}

/**
Expand Down Expand Up @@ -386,6 +386,9 @@ private List<String> prepareCommandOptions(
commandParts.add(option.getValue());
}
}
for (Option option : getElementsOf(NameOnlyOption.class, options)) {
commandParts.add("--" + option.getName());
}
// new in solidity 0.5.0: using stdin requires an explicit "-". The following output
// of 'solc' if no file is provided, e.g.,: solc --combined-json abi,bin,interface,metadata
//
Expand Down

0 comments on commit ed68add

Please sign in to comment.