Skip to content

Commit

Permalink
Merge pull request #67 from SokaDance/release-v1.6.0
Browse files Browse the repository at this point in the history
[build] update go generator to 1.7.0 and generators to 1.6.0
  • Loading branch information
SokaDance authored May 23, 2023
2 parents a4707a1 + 09e39dc commit d96e5d1
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions Dockerfile-go
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ INCLUDE+ Dockerfile-base
FROM openjdk:16-alpine AS jvm
COPY --from=build /home/soft.gen/out/soft.generator.go/*.jar /soft.generator.go/
WORKDIR /soft.generator.go
RUN jdeps --print-module-deps --multi-release 16 --ignore-missing-deps --class-path '*' -recursive soft.generator.go-1.6.0.jar > java.modules \
RUN jdeps --print-module-deps --multi-release 16 --ignore-missing-deps --class-path '*' -recursive soft.generator.go-1.7.0.jar > java.modules \
&& jlink --strip-java-debug-attributes --add-modules $(cat java.modules) --output /java-generator

# Build result stage
FROM alpine
COPY --from=build /home/soft.gen/out/soft.generator.go/*.jar /usr/share/soft.generator.go/
COPY --from=jvm /java-generator /usr/lib/jvm/java-generator

ENTRYPOINT ["/usr/lib/jvm/java-generator/bin/java","-jar","/usr/share/soft.generator.go/soft.generator.go-1.6.0.jar"]
ENTRYPOINT ["/usr/lib/jvm/java-generator/bin/java","-jar","/usr/share/soft.generator.go/soft.generator.go-1.7.0.jar"]
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
langs := go ts cpp
packages := go ts cpp common
soft.generators.version := 1.5.1
soft.generators.version := 1.6.0
soft.generator.common.version := 1.3.0
soft.generator.cpp.version := 1.2.4
soft.generator.go.version := 1.6.0
soft.generator.go.version := 1.7.0
soft.generator.ts.version := 1.0.5

export DOCKER_BUILDKIT=1
Expand Down
2 changes: 1 addition & 1 deletion soft.generators/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>soft.generators</groupId>
<artifactId>soft.generators</artifactId>
<version>1.5.1</version>
<version>1.6.0</version>
<packaging>pom</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
2 changes: 1 addition & 1 deletion soft.generators/soft.generator.common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>soft.generators</groupId>
<artifactId>soft.generators</artifactId>
<version>1.5.1</version>
<version>1.6.0</version>
</parent>
<artifactId>soft.generator.common</artifactId>
<version>1.3.0</version>
Expand Down
2 changes: 1 addition & 1 deletion soft.generators/soft.generator.cpp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>soft.generators</groupId>
<artifactId>soft.generators</artifactId>
<version>1.5.1</version>
<version>1.6.0</version>
</parent>
<artifactId>soft.generator.cpp</artifactId>
<version>1.2.4</version>
Expand Down
2 changes: 1 addition & 1 deletion soft.generators/soft.generator.go/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Created-By: 13.0.2+8 (Oracle Corporation)
Bundle-ManifestVersion: 2
Bundle-Name: Soft Generator Go
Bundle-SymbolicName: soft.generator.go
Bundle-Version: 1.6.0
Bundle-Version: 1.7.0
Export-Package: soft.generator.go,soft.generator.go.lib,soft.generator
.go.lib.factory,soft.generator.go.lib.pack,soft.generator.go.tests
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Expand Down
4 changes: 2 additions & 2 deletions soft.generators/soft.generator.go/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
<parent>
<groupId>soft.generators</groupId>
<artifactId>soft.generators</artifactId>
<version>1.5.1</version>
<version>1.6.0</version>
</parent>
<artifactId>soft.generator.go</artifactId>
<version>1.6.0</version>
<version>1.7.0</version>
<dependencies>
<dependency>
<groupId>soft.generators</groupId>
Expand Down
2 changes: 1 addition & 1 deletion soft.generators/soft.generator.ts/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>soft.generators</groupId>
<artifactId>soft.generators</artifactId>
<version>1.5.1</version>
<version>1.6.0</version>
</parent>
<artifactId>soft.generator.ts</artifactId>
<version>1.0.5</version>
Expand Down

0 comments on commit d96e5d1

Please sign in to comment.