build(deps): Bump GraalVM version

Signed-off-by: tison <wander4096@gmail.com>
korandoru · Oct 17, 2023 · 9055977 · 9055977
1 parent c50d590
commit 9055977
Show file tree

Hide file tree

Showing 26 changed files with 140 additions and 163 deletions.
diff --git a/.github/semantic.yml b/.github/semantic.yml
@@ -1,10 +1,10 @@
-# Copyright 2023 Korandoru Contributors
+# Copyright 2022 Korandoru Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     https://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,10 +1,10 @@
-# Copyright 2022-2023 Korandoru Contributors
+# Copyright 2022 Korandoru Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     https://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -43,14 +43,16 @@ jobs:
     timeout-minutes: 10
     steps:
       - uses: actions/checkout@v3
+      - name: Check license header
+        uses: korandoru/hawkeye@v3
       - name: Setup Java
         uses: graalvm/setup-graalvm@v1
         with:
-          version: '22.3.0'
           java-version: '17'
+          distribution: 'graalvm'
           github-token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Check license header
-        run: mvn license:format
+      - name: Check codestyle
+        run: mvn spotless:check
 
   build:
     if: (github.event_name != 'schedule') || (github.repository == 'korandoru/trufflebf')
@@ -62,11 +64,11 @@ jobs:
       - name: Setup Java
         uses: graalvm/setup-graalvm@v1
         with:
-          version: '22.3.0'
           java-version: '17'
+          distribution: 'graalvm'
           components: 'native-image'
           github-token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Build natives
+      - name: Build and check
         run: mvn clean package -DskipTests
-      - name: Check natives
+      - name: Sanity check
         run: ./trufflebf-native/bf examples/helloworld.bf
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ TruffleBF is a [brainfuck](https://en.wikipedia.org/wiki/Brainfuck) implementati
 
 ## Prerequisites
 
-- [GraalVM 22.3.0](http://www.graalvm.org/docs/getting-started/)
+- [GraalVM for JDK 17](https://www.graalvm.org/jdk17/docs/getting-started/)
 - Maven 3.8.6
 
 ## Build and run
@@ -18,7 +18,7 @@ mvn clean package -DskipTests
 
 ```shell
 mvn package -DskipTests
-gu install -L trufflebf-component/bf-component.jar 
+gu install -L trufflebf-component/bf-component.jar
 ```
 
 After install TruffleBF into GraalVM, you can run the interop examples.

diff --git a/examples/Interop.java b/examples/Interop.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2022-2023 Korandoru Contributors
+ * Copyright 2022 Korandoru Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     https://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

diff --git a/examples/interop.c b/examples/interop.c
@@ -1,18 +1,19 @@
-/**
- * Copyright 2022-2023 Korandoru Contributors
+/*
+ * Copyright 2022 Korandoru Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     https://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #include <graalvm/llvm/polyglot.h>
 
 int main() {

diff --git a/examples/interop.js b/examples/interop.js
@@ -1,11 +1,11 @@
 /*
- * Copyright 2022-2023 Korandoru Contributors
+ * Copyright 2022 Korandoru Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     https://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

diff --git a/examples/interop.rb b/examples/interop.rb
@@ -1,10 +1,10 @@
-# Copyright 2022-2023 Korandoru Contributors
+# Copyright 2022 Korandoru Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     https://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,

diff --git a/licenserc.toml b/licenserc.toml
@@ -0,0 +1,21 @@
+# Copyright 2022 Korandoru Contributors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+baseDir = "."
+
+headerPath = "Apache-2.0.txt"
+
+[properties]
+inceptionYear = 2022
+copyrightOwner = "Korandoru Contributors"
diff --git a/pom.xml b/pom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2022-2023 Korandoru Contributors
+    Copyright 2022 Korandoru Contributors
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
 
-        https://www.apache.org/licenses/LICENSE-2.0
+        http://www.apache.org/licenses/LICENSE-2.0
 
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
@@ -40,10 +40,10 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <exec-maven-plugin.version>3.1.0</exec-maven-plugin.version>
-        <graalvm.version>22.3.0</graalvm.version>
+        <graalvm.version>23.0.0</graalvm.version>
         <maven-shade-plugin.version>3.4.1</maven-shade-plugin.version>
-        <license-maven-plugin.version>4.2.rc3</license-maven-plugin.version>
         <os-maven-plugin.version>1.7.1</os-maven-plugin.version>
+        <spotless-maven-plugin.version>2.40.0</spotless-maven-plugin.version>
     </properties>
 
     <url>https://github.com/korandoru/zeronos</url>
@@ -79,6 +79,11 @@
                     <groupId>org.codehaus.mojo</groupId>
                     <version>${exec-maven-plugin.version}</version>
                 </plugin>
+                <plugin>
+                    <groupId>com.diffplug.spotless</groupId>
+                    <artifactId>spotless-maven-plugin</artifactId>
+                    <version>${spotless-maven-plugin.version}</version>
+                </plugin>
             </plugins>
         </pluginManagement>
         <extensions>
@@ -90,39 +95,42 @@
         </extensions>
         <plugins>
             <plugin>
-                <groupId>com.mycila</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <version>${license-maven-plugin.version}</version>
+                <groupId>com.diffplug.spotless</groupId>
+                <artifactId>spotless-maven-plugin</artifactId>
                 <configuration>
-                    <licenseSets>
-                        <licenseSet>
-                            <header>tools/ci/license-header-template.txt</header>
+                    <formats>
+                        <format>
                             <includes>
-                                <!-- Force override the default exclusions -->
-                                <include>**</include>
-                                <include>**/.github</include>
-                                <include>**/.github/**</include>
+                                <include>*.md</include>
+                                <include>.gitignore</include>
+                                <include>pom.xml</include>
                             </includes>
-                            <excludes>
-                                <exclude>**/component_temp_dir/**</exclude>
-                                <exclude>interop.bc</exclude>
-                                <exclude>examples/helloworld.bf</exclude>
-                            </excludes>
-                        </licenseSet>
-                    </licenseSets>
-                    <headerDefinitions>
-                        <headerDefinition>tools/ci/license-header-override-styles.xml</headerDefinition>
-                    </headerDefinitions>
+                            <trimTrailingWhitespace />
+                            <endWithNewline />
+                            <indent>
+                                <spaces>true</spaces>
+                                <spacesPerTab>4</spacesPerTab>
+                            </indent>
+                        </format>
+                    </formats>
+                    <java>
+                        <palantirJavaFormat>
+                            <version>2.38.0</version>
+                        </palantirJavaFormat>
+                        <!-- static imports first, then others, no blank lines  -->
+                        <importOrder>
+                            <order>\#|</order>
+                        </importOrder>
+                        <removeUnusedImports />
+                        <trimTrailingWhitespace />
+                        <endWithNewline />
+                        <indent>
+                            <spaces>true</spaces>
+                            <spacesPerTab>4</spacesPerTab>
+                        </indent>
+                    </java>
                 </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>com.mycila</groupId>
-                        <artifactId>license-maven-plugin-git</artifactId>
-                        <version>${license-maven-plugin.version}</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
     </build>
-
 </project>
diff --git a/tools/ci/license-header-override-styles.xml b/tools/ci/license-header-override-styles.xml
diff --git a/tools/ci/license-header-template.txt b/tools/ci/license-header-template.txt
diff --git a/trufflebf-component/clean_component.sh b/trufflebf-component/clean_component.sh
@@ -1,17 +1,18 @@
 #!/usr/bin/env bash
-
-# Copyright 2022-2023 Korandoru Contributors
+# Copyright 2022 Korandoru Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     https://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
+
 [[ -f bf-component.jar ]] && rm bf-component.jar || echo "bf-component.jar not found"
diff --git a/trufflebf-component/make_component.sh b/trufflebf-component/make_component.sh
@@ -1,19 +1,20 @@
 #!/usr/bin/env bash
-
-# Copyright 2022-2023 Korandoru Contributors
+# Copyright 2022 Korandoru Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     https://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
+
 declare -r GRAALVM_VERSION="${1:?The first argument must be GraalVM version.}"
 declare -r OS_DETECTED_ARCH="${2:?The second argument must be machine arch.}"
 

diff --git a/trufflebf-component/pom.xml b/trufflebf-component/pom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2022-2023 Korandoru Contributors
+    Copyright 2022 Korandoru Contributors
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
 
-        https://www.apache.org/licenses/LICENSE-2.0
+        http://www.apache.org/licenses/LICENSE-2.0
 
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
@@ -62,5 +62,4 @@
             </plugin>
         </plugins>
     </build>
-
-</project>
+</project>