Merge branch 'main' into arm64-aarch64

# Conflicts: # .github/workflows/release.yml # pom.xml
neodix42 · Mar 19, 2024 · bba0f68 · bba0f68
2 parents 7ec0e50 + 6a7fd96
commit bba0f68
Show file tree

Hide file tree

Showing 16 changed files with 617 additions and 316 deletions.
diff --git a/.github/workflows/commit.yml b/.github/workflows/commit.yml
@@ -0,0 +1,47 @@
+name: Test changes
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+
+jobs:
+  build:
+    runs-on: windows-2019
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v2
+        with:
+          java-version: '17'
+          distribution: 'adopt'
+
+      - name: Build x86-64 mainnet
+        run: |
+          mkdir artifacts
+          git fetch -a          
+          mvn clean compile package -DskipTests
+          cp target/MyLocalTon.jar artifacts/MyLocalTon-x86-64.jar
+
+      - name: Build x86-64 testnet
+        run: |
+          mvn clean compile package -DskipTests -Dton_branch=testnet
+          cp target/MyLocalTon.jar artifacts/MyLocalTon-x86-64-testnet.jar
+
+      - name: Build arm64-aarch64 mainnet
+        run: |
+          git checkout arm64-aarch64
+          mvn clean compile package -DskipTests
+          cp target/MyLocalTon.jar artifacts/MyLocalTon-arm64.jar
+
+      - name: Build arm64-aarch64 testnet
+        run: |
+          mvn clean compile package -DskipTests -Dton_branch=testnet
+          cp target/MyLocalTon.jar artifacts/MyLocalTon-arm64-testnet.jar
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@master
+        with:
+          name: All-MyLocalTon-Jars
+          path: artifacts
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,5 @@
 ### Changes in this release
 
-- Update TON binaries as of 17.01.2024
+- added support of headless java
+- added nogui argument
+- added <ip> argument in order to listen on specified ip address
diff --git a/README.md b/README.md
@@ -17,15 +17,15 @@ This is your personal local TON blockchain (www.ton.org) in a shape of cross-pla
 form of uber-jar with all dependencies and binaries. Please notice this an
 alpha version and cannot be treated as production ready.
 
-<img src='./screens/MyLocalTon-demo.gif'>
+<img alt="MyLocalton gif demo" src='./screens/MyLocalTon-demo.gif'>
 
 ## Matrix of supported OS & Java
 
 | OS \ Java           | 11                 | 13                 | 15                 | 17                 | 19                 |
 |---------------------|--------------------|--------------------|--------------------|--------------------|--------------------|
 | Linux x86_64        | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 | Linux arm64/aarch64 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
-| MacOS x86_64 (11+)  | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
+| MacOS x86_64 (12+)  | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 | MacOS arm64/aarch64 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 | Windows x86_64      | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 
@@ -59,17 +59,12 @@ https://docs.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist?view=msv
 
 ## Installation and usage
 
-### For x86_64 architecture
-
-Go to https://github.com/neodiX42/MyLocalTon/releases. Open Assets section and download MyLocalTon.jar.
+Go to https://github.com/neodiX42/MyLocalTon/releases. Open Assets section and download MyLocalTon for your architecture
 
 Open console and execute the following command:
 
-`java -jar MyLocalTon.jar`
-
-### For aarch64/arm64 architecture (MacOS M1 and Linux)
-
-Go to https://github.com/neodiX42/MyLocalTon/releases and select version with `arm64-aarch64` prefix.
+`java -jar MyLocalTon-x86-64.jar` or
+`java -jar MyLocalTon-arm64.jar`
 
 ## Upgrade
 

diff --git a/pom.xml b/pom.xml
@@ -8,8 +8,9 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <ton_branch>master</ton_branch>
         <java.version>11</java.version>
+
+        <ton_branch>master</ton_branch>
         <maven.compiler.release>11</maven.compiler.release>
         <maven.compiler.version>3.8.1</maven.compiler.version>
         <maven.clean.plugin.version>3.1.0</maven.clean.plugin.version>
@@ -54,6 +55,11 @@
     </repositories>
 
     <dependencies>
+        <dependency>
+            <groupId>com.googlecode.lanterna</groupId>
+            <artifactId>lanterna</artifactId>
+            <version>3.1.2</version>
+        </dependency>
         <dependency>
             <groupId>io.github.neodix42</groupId>
             <artifactId>smartcontract</artifactId>
@@ -111,7 +117,6 @@
             <version>${openjfx.version}</version>
             <classifier>linux-aarch64</classifier>
         </dependency>
-
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-graphics</artifactId>
@@ -310,7 +315,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-clean-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>${maven.clean.plugin.version}</version>
                 <configuration>
                     <filesets>
                         <fileset>
@@ -333,7 +338,10 @@
                                 <include>*ton-win*</include>
                             </includes>
                         </fileset>
+
+
                     </filesets>
+
                 </configuration>
             </plugin>
 
@@ -349,8 +357,11 @@
                             <goal>wget</goal>
                         </goals>
                         <configuration>
-                            <skipCache>true</skipCache>
-                            <uri>${linux.arm64.ton.binaries.uri}</uri>
+                            <overwrite>true</overwrite>
+                            <skipCache>false</skipCache>
+                            <uri>
+                                ${linux.arm64.ton.binaries.uri}
+                            </uri>
                             <unpack>true</unpack>
                             <outputDirectory>${project.build.directory}/binaries-linux-arm64</outputDirectory>
                         </configuration>
@@ -362,7 +373,8 @@
                             <goal>wget</goal>
                         </goals>
                         <configuration>
-                            <skipCache>true</skipCache>
+                            <overwrite>true</overwrite>
+                            <skipCache>false</skipCache>
                             <uri>${mac.arm64.ton.binaries.uri}</uri>
                             <unpack>true</unpack>
                             <outputDirectory>${project.build.directory}/binaries-mac-arm64</outputDirectory>
@@ -376,7 +388,6 @@
                 <artifactId>maven-antrun-plugin</artifactId>
                 <version>${maven.clean.plugin.version}</version>
                 <executions>
-
                     <execution>
                         <id>copy-final-ton-linux-arm64_to_resources</id>
                         <phase>process-resources</phase>
@@ -394,7 +405,6 @@
                             </target>
                         </configuration>
                     </execution>
-
                     <execution>
                         <id>copy-final-ton-mac-arm64_to_resources</id>
                         <phase>process-resources</phase>
@@ -448,6 +458,7 @@
                             </descriptors>
                         </configuration>
                     </execution>
+
                     <execution>
                         <phase>package</phase>
                         <goals>