From f90ed0a264ae88151f64fe81d4de6943bead105b Mon Sep 17 00:00:00 2001
From: dkimitsa <demyan.kimitsa@gmail.com>
Date: Mon, 29 Jun 2026 10:36:44 +0300
Subject: [PATCH] * dist package re-arrangement: include sources into snapshot,
 no bin for libs only, warning cleanup - including RT and OBJC source jars for
 both release and snapshot (its pain to have no these in idea) - assembly
 plugin version updated to 3.8.0 to fix warn: [WARNING]  Parameter 'finalName'
 is read-only, must not be used in configuration - fixed warning [WARNING] The
 following patterns were never triggered in this artifact inclusion filter:
 '*:*:*:sources' '*:*:*:javadoc' - removed `bin/` folder with
 libhfscompressor-arm64.dylib from `-nocompiler` tar.

---
 dist/package/pom.xml                          | 24 ++++++++-----------
 .../package/src/main/assembly/dist-common.xml |  8 -------
 dist/package/src/main/assembly/dist-full.xml  | 14 ++++++++++-
 .../src/main/assembly/dist-nocompiler.xml     |  2 +-
 pom.xml                                       | 11 +++++++--
 5 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/dist/package/pom.xml b/dist/package/pom.xml
index f33136b9c..501e814da 100755
--- a/dist/package/pom.xml
+++ b/dist/package/pom.xml
@@ -16,20 +16,6 @@
         <robovmdir>${basedir}/../../compiler</robovmdir>
     </properties>
 
-    <profiles>
-        <profile>
-            <id>robovm-release</id>
-            <dependencies>
-                <!-- RT sources are build during release only -->
-                <dependency>
-                    <groupId>com.mobidevelop.robovm</groupId>
-                    <artifactId>robovm-rt</artifactId>
-                    <classifier>sources</classifier>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
-
     <dependencies>
         <dependency>
             <groupId>com.mobidevelop.robovm</groupId>
@@ -39,9 +25,19 @@
             <groupId>com.mobidevelop.robovm</groupId>
             <artifactId>robovm-rt</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.mobidevelop.robovm</groupId>
+            <artifactId>robovm-rt</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
+        <dependency>
+            <groupId>com.mobidevelop.robovm</groupId>
+            <artifactId>robovm-objc</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.mobidevelop.robovm</groupId>
             <artifactId>robovm-objc</artifactId>
+            <classifier>sources</classifier>
         </dependency>
         <dependency>
             <groupId>com.mobidevelop.robovm</groupId>
diff --git a/dist/package/src/main/assembly/dist-common.xml b/dist/package/src/main/assembly/dist-common.xml
index cb868b9ad..2eddabc10 100755
--- a/dist/package/src/main/assembly/dist-common.xml
+++ b/dist/package/src/main/assembly/dist-common.xml
@@ -17,14 +17,6 @@
       <fileMode>644</fileMode>
       <outputDirectory>lib/vm</outputDirectory>
     </fileSet>
-    <fileSet>
-      <directory>${robovmdir}/bin</directory>
-      <includes>
-        <include>*</include>
-      </includes>
-      <fileMode>755</fileMode>
-      <outputDirectory>bin</outputDirectory>
-    </fileSet>
     <fileSet>
       <directory>${robovmdir}/compiler</directory>
       <outputDirectory>modules/licenses/dist-compiler/compiler</outputDirectory>
diff --git a/dist/package/src/main/assembly/dist-full.xml b/dist/package/src/main/assembly/dist-full.xml
index da88f40c3..458ee8163 100755
--- a/dist/package/src/main/assembly/dist-full.xml
+++ b/dist/package/src/main/assembly/dist-full.xml
@@ -14,6 +14,18 @@
     <componentDescriptor>src/main/assembly/dist-common.xml</componentDescriptor>
   </componentDescriptors>
 
+  <!-- binaries only needed for compiler package -->
+  <fileSets>
+    <fileSet>
+      <directory>${robovmdir}/bin</directory>
+      <includes>
+        <include>*</include>
+      </includes>
+      <fileMode>755</fileMode>
+      <outputDirectory>bin</outputDirectory>
+    </fileSet>
+  </fileSets>
+
   <dependencySets>
     <dependencySet>
       <includes>
@@ -29,7 +41,7 @@
     <dependencySet>
       <includes>
         <include>*:*:*:sources</include>
-        <include>*:*:*:javadoc</include>
+<!-- there is no javadoc meanwhile, commented out to remove warning       <include>*:*:*:javadoc</include>-->
       </includes>
       <outputDirectory>lib</outputDirectory>
       <unpack>false</unpack>
diff --git a/dist/package/src/main/assembly/dist-nocompiler.xml b/dist/package/src/main/assembly/dist-nocompiler.xml
index ffc72e13a..18f68dc80 100755
--- a/dist/package/src/main/assembly/dist-nocompiler.xml
+++ b/dist/package/src/main/assembly/dist-nocompiler.xml
@@ -32,7 +32,7 @@
     <dependencySet>
       <includes>
         <include>*:*:*:sources</include>
-        <include>*:*:*:javadoc</include>
+        <!-- there is no javadoc meanwhile, commented out to remove warning       <include>*:*:*:javadoc</include>-->
       </includes>
       <outputDirectory>lib</outputDirectory>
       <unpack>false</unpack>
diff --git a/pom.xml b/pom.xml
index e776864c9..9fa3357e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -242,7 +242,7 @@
                 <artifactId>robovm-rt</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <!-- FIXME: -->
+            <!-- robovm-rt sources used in dist -->
             <dependency>
                 <groupId>com.mobidevelop.robovm</groupId>
                 <artifactId>robovm-rt</artifactId>
@@ -254,6 +254,13 @@
                 <artifactId>robovm-objc</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <!-- robovm-objc sources used in dist -->
+            <dependency>
+                <groupId>com.mobidevelop.robovm</groupId>
+                <artifactId>robovm-objc</artifactId>
+                <version>${project.version}</version>
+                <classifier>sources</classifier>
+            </dependency>
             <dependency>
                 <groupId>com.mobidevelop.robovm</groupId>
                 <artifactId>robovm-cocoatouch</artifactId>
@@ -453,7 +460,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-assembly-plugin</artifactId>
-                    <version>3.1.1</version>
+                    <version>3.8.0</version>
                     <configuration>
                         <!-- FIXME: this one is to fix "single failed: group id 'SOME BIG ID' is too big" when mac is in NT domain -->
                         <!-- FIXME: this adds PaxHeaders.X in this case, check if it will be adding it for normal user -->