Life must be simple. Removed the problematic utf-8 character ⚛

Signed-off-by: Prabhu Subramanian <[email protected]>
AppThreat · Jan 15, 2025 · bc44b73 · bc44b73
1 parent f9ac0e0
commit bc44b73
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -153,6 +153,13 @@ docker run --rm -v /tmp:/tmp -v $(pwd):/app:rw -it ghcr.io/appthreat/atom atom u
 # podman run --rm -v /tmp:/tmp -v $(pwd):/app:rw -it ghcr.io/appthreat/atom atom usages -l ruby -o /app/app.atom -s /app/usages.slices.json /app
 ```
 
+Pass the argument `--platform=linux/amd64` when you face issues with Java or Ruby builds on arm64 architecture.
+
+```shell
+docker run --rm --platform=linux/amd64 -v /tmp:/tmp -v $(pwd):/app:rw -it ghcr.io/appthreat/atom atom usages -l ruby -o /app/app.atom -s /app/usages.slices.json /app
+# podman run --rm --platform=linux/amd64 -v /tmp:/tmp -v $(pwd):/app:rw -it ghcr.io/appthreat/atom atom usages -l ruby -o /app/app.atom -s /app/usages.slices.json /app
+```
+
 ### Create data-flow slice for a java project.
 
 ```shell

diff --git a/ci/Dockerfile b/ci/Dockerfile
@@ -54,6 +54,7 @@ RUN set -e; \
         pcre2 findutils which tar gzip zip unzip sudo nodejs rust \
     && microdnf install -y epel-release \
     && microdnf install --enablerepo=crb -y libyaml-devel jemalloc-devel \
+    && java --version \
     && git clone https://github.com/rbenv/rbenv.git --depth=1 ~/.rbenv \
     && echo 'export PATH="/root/.rbenv/bin:$PATH"' >> ~/.bashrc \
     && echo 'eval "$(/root/.rbenv/bin/rbenv init - bash)"' >> ~/.bashrc \

diff --git a/ci/Dockerfile.sle b/ci/Dockerfile.sle
@@ -88,6 +88,7 @@ RUN unzip -q atom.zip \
     && cd /opt/nodejs && npm install --only=production && cd /opt \
     && npm install -g /opt/nodejs \
     && rm -rf atom.zip composer.json composer.lock composer-setup.php /usr/local/bin/atom \
+    && java --version \
     && /opt/bin/atom --help \
     && which astgen \
     && which phpastgen \

diff --git a/src/main/scala/io/appthreat/atom/Atom.scala b/src/main/scala/io/appthreat/atom/Atom.scala
@@ -46,15 +46,13 @@ import scala.util.{Failure, Properties, Success, Try}
 
 object Atom:
 
-  val DEFAULT_ATOM_OUT_FILE: String =
-      if Properties.isWin || Charset.defaultCharset() != Charset.forName("UTF-8") then "app.atom"
-      else "app.⚛"
-  val DEFAULT_SLICE_OUT_FILE       = "slices.json"
-  val DEFAULT_SLICE_DEPTH          = 7
-  val DEFAULT_MAX_DEFS: Int        = 2000
-  val FRAMEWORK_INPUT_TAG: String  = "framework-input"
-  val FRAMEWORK_OUTPUT_TAG: String = "framework-output"
-  val DEFAULT_EXPORT_DIR: String   = "atom-exports"
+  val DEFAULT_ATOM_OUT_FILE: String = "app.atom"
+  val DEFAULT_SLICE_OUT_FILE        = "slices.json"
+  val DEFAULT_SLICE_DEPTH           = 7
+  val DEFAULT_MAX_DEFS: Int         = 2000
+  val FRAMEWORK_INPUT_TAG: String   = "framework-input"
+  val FRAMEWORK_OUTPUT_TAG: String  = "framework-output"
+  val DEFAULT_EXPORT_DIR: String    = "atom-exports"
   // Possible values: graphml, dot
   val DEFAULT_EXPORT_FORMAT: String = "graphml"
   // Possible values: no-delombok, default, types-only, run-delombok