From 8c2449ea0202f51893dbc052de0b3a7dfca25db6 Mon Sep 17 00:00:00 2001
From: soroshsabz <soorosh_abi@hotmail.com>
Date: Fri, 10 Jan 2025 17:53:03 +0330
Subject: [PATCH 1/5] Make buildable on Windows 11

---
 java/androidpayload/app/pom.xml               | 12 ++++++++-
 java/androidpayload/app/proguard.cfg          |  2 ++
 java/androidpayload/library/pom.xml           | 27 ++++++++++++++-----
 java/meterpreter/meterpreter/pom.xml          |  4 +--
 java/meterpreter/stdapi/pom.xml               |  2 +-
 java/pom.xml                                  |  4 +--
 .../android-api/pom.xml                       |  6 ++---
 7 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/java/androidpayload/app/pom.xml b/java/androidpayload/app/pom.xml
index 231abee43..3ae51e06d 100644
--- a/java/androidpayload/app/pom.xml
+++ b/java/androidpayload/app/pom.xml
@@ -64,13 +64,23 @@
 					<sdk>
 						<!-- platform or api level (api level 10 = platform 2.3)-->
 						<platform>10</platform>
+						<buildTools>29.0.3</buildTools>
 					</sdk>
 					<proguard>
-						<skip>false</skip>
+						<skip>true</skip>
 						<config>proguard.cfg</config>
 					</proguard>
 				</configuration>
 			</plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.0</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
 		</plugins>
 	</build>
 	<profiles>
diff --git a/java/androidpayload/app/proguard.cfg b/java/androidpayload/app/proguard.cfg
index 8bbae65ff..2f5754767 100644
--- a/java/androidpayload/app/proguard.cfg
+++ b/java/androidpayload/app/proguard.cfg
@@ -1,3 +1,5 @@
+# Preserve all classes from the Java standard library
+-keep class java.lang.** { *; }
 
 -keep public class * extends android.app.Activity
 -keep public class * extends android.app.Service
diff --git a/java/androidpayload/library/pom.xml b/java/androidpayload/library/pom.xml
index 572adcf32..0cb7739fb 100644
--- a/java/androidpayload/library/pom.xml
+++ b/java/androidpayload/library/pom.xml
@@ -81,6 +81,7 @@
 					<sdk>
 						<!-- platform or api level (api level 19 = platform 4.4 (kitkat))-->
 						<platform>19</platform>
+						<buildTools>29.0.3</buildTools>
 					</sdk>
 				</configuration>
 			</plugin>
@@ -89,8 +90,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.0</version>
                 <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
         </plugins>
@@ -127,7 +128,10 @@
 											<zipfileset src="${com.metasploit:Metasploit-JavaPayload:jar}" includes="javapayload/stage/StreamForwarder.class" />
 											<zipfileset src="${com.metasploit:Metasploit-JavaPayload:jar}" includes="javapayload/stage/Stage.class" />
 										</copy>
-										<exec executable="${android.sdk.path}/platforms/android-3/tools/${dx.filename}" failonerror="true">
+										<exec executable="java" failonerror="true">
+											<arg value="-Xmx1024M" />
+											<arg value="-jar" />
+											<arg value="${android.sdk.path}/build-tools/29.0.3/lib/dx.jar" />
 											<arg value="--verbose" />
 											<arg value="--dex" />
 											<arg value="--output=${project.basedir}/../../${deploy.path}/data/android/shell.jar" />
@@ -142,7 +146,10 @@
 											</fileset>
 											<zipfileset src="${com.metasploit:Metasploit-JavaPayload:jar}" includes="javapayload/stage/Stage.class" />
 										</copy>
-										<exec executable="${android.sdk.path}/platforms/android-3/tools/${dx.filename}" failonerror="true">
+										<exec executable="java" failonerror="true">
+											<arg value="-Xmx1024M" />
+											<arg value="-jar" />
+											<arg value="${android.sdk.path}/build-tools/29.0.3/lib/dx.jar" />
 											<arg value="--verbose" />
 											<arg value="--dex" />
 											<arg value="--output=${project.basedir}/../../${deploy.path}/data/android/metstage.jar" />
@@ -156,7 +163,11 @@
 												<include name="com/metasploit/meterpreter/**/*.class" />
 											</fileset>
 										</copy>
-										<exec executable="${android.sdk.path}/platforms/android-3/tools/${dx.filename}" failonerror="true">
+
+										<exec executable="java" failonerror="true">
+											<arg value="-Xmx1024M" />
+											<arg value="-jar" />
+											<arg value="${android.sdk.path}/build-tools/29.0.3/lib/dx.jar" />
 											<arg value="--verbose" />
 											<arg value="--dex" />
 											<arg value="--output=${project.basedir}/../../${deploy.path}/data/android/meterpreter.jar" />
@@ -167,7 +178,11 @@
 										</exec>
 
 										<echo>Building stageless meterpreter</echo>
-										<exec executable="${android.sdk.path}/platforms/android-3/tools/${dx.filename}" failonerror="true">
+
+										<exec executable="java" failonerror="true">
+											<arg value="-Xmx1024M" />
+											<arg value="-jar" />
+											<arg value="${android.sdk.path}/build-tools/29.0.3/lib/dx.jar" />
 											<arg value="--verbose" />
 											<arg value="--dex" />
 											<arg value="--output=${project.basedir}/../../${deploy.path}/data/android/meterpreter.dex" />
diff --git a/java/meterpreter/meterpreter/pom.xml b/java/meterpreter/meterpreter/pom.xml
index 3bdc43660..03cf9d0bc 100644
--- a/java/meterpreter/meterpreter/pom.xml
+++ b/java/meterpreter/meterpreter/pom.xml
@@ -57,7 +57,7 @@
 				<plugins>
 					<plugin>
 						<artifactId>maven-antrun-plugin</artifactId>
-						<version>1.7</version>
+						<version>1.8</version>
 						<executions>
 							<execution>
 								<phase>package</phase>
@@ -68,7 +68,7 @@
 									<target>
 										<mkdir dir="${project.basedir}/target/tmp" />
 										<unzip src="${project.basedir}/target/${project.build.finalName}.jar" dest="${project.basedir}/target/tmp" />
-										<touch datetime="01/01/2000 00:00 AM">
+										<touch datetime="01/01/2000 00:00:00 AM" pattern="MM/dd/YYYY hh:mm:ss a">
 											<fileset dir="${project.basedir}/target/tmp" includes="**/*" />
 										</touch>
 										<delete file="${project.basedir}/../../${deploy.path}/data/meterpreter/${project.build.finalName}.jar"/>
diff --git a/java/meterpreter/stdapi/pom.xml b/java/meterpreter/stdapi/pom.xml
index d90a7c0da..06c3ea17d 100644
--- a/java/meterpreter/stdapi/pom.xml
+++ b/java/meterpreter/stdapi/pom.xml
@@ -80,7 +80,7 @@
 									<target>
 										<mkdir dir="${project.basedir}/target/tmp" />
 										<unzip src="${project.basedir}/target/${project.build.finalName}.jar" dest="${project.basedir}/target/tmp" />
-										<touch datetime="01/01/2000 00:00 AM">
+										<touch datetime="01/01/2000 00:00:00 AM" pattern="MM/dd/YYYY hh:mm:ss a">
 											<fileset dir="${project.basedir}/target/tmp" includes="**/*" />
 										</touch>
 										<delete file="${project.basedir}/../../${deploy.path}/data/meterpreter/${project.build.finalName}.jar"/>
diff --git a/java/pom.xml b/java/pom.xml
index 3610dcff3..9e8294fd7 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -26,8 +26,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.0</version>
 				<configuration>
-					<source>1.5</source>
-					<target>1.5</target>
+					<source>1.8</source>
+					<target>1.8</target>
 					<debug>true</debug> <!-- http://stackoverflow.com/q/4220083/90203 -->
 					<debuglevel>none</debuglevel>
 				</configuration>
diff --git a/java/version-compatibility-check/android-api/pom.xml b/java/version-compatibility-check/android-api/pom.xml
index 4b11ba2e0..a73160528 100644
--- a/java/version-compatibility-check/android-api/pom.xml
+++ b/java/version-compatibility-check/android-api/pom.xml
@@ -32,13 +32,13 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.0</version>
 				<configuration>
-					<source>1.5</source>
-					<target>1.5</target>
+					<source>1.6</source>
+					<target>1.6</target>
 				</configuration>
 			</plugin>
 			<plugin>
 				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.7</version>
+				<version>1.8</version>
 				<executions>
 					<execution>
 						<id>copy-source</id>

From fd1234574c094d43654c484841b0665983465e70 Mon Sep 17 00:00:00 2001
From: soroshsabz <soorosh_abi@hotmail.com>
Date: Fri, 10 Jan 2025 18:02:33 +0330
Subject: [PATCH 2/5] dx.filepath property set

---
 java/androidpayload/app/pom.xml                     |  4 ++--
 java/androidpayload/library/pom.xml                 | 13 +++++--------
 .../version-compatibility-check/android-api/pom.xml |  4 ++--
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/java/androidpayload/app/pom.xml b/java/androidpayload/app/pom.xml
index 3ae51e06d..bd66db017 100644
--- a/java/androidpayload/app/pom.xml
+++ b/java/androidpayload/app/pom.xml
@@ -67,7 +67,7 @@
 						<buildTools>29.0.3</buildTools>
 					</sdk>
 					<proguard>
-						<skip>true</skip>
+						<skip>false</skip>
 						<config>proguard.cfg</config>
 					</proguard>
 				</configuration>
@@ -91,7 +91,7 @@
 				<plugins>
 					<plugin>
 						<artifactId>maven-antrun-plugin</artifactId>
-						<version>1.7</version>
+						<version>1.8</version>
 						<executions>
 							<execution>
 								<phase>package</phase>
diff --git a/java/androidpayload/library/pom.xml b/java/androidpayload/library/pom.xml
index 0cb7739fb..6db402225 100644
--- a/java/androidpayload/library/pom.xml
+++ b/java/androidpayload/library/pom.xml
@@ -113,10 +113,7 @@
 								</goals>
 								<configuration>
 									<target>
-										<condition property="dx.filename" value="dx.bat">
-											<os family="windows" />
-										</condition>
-										<property name="dx.filename" value="dx" />
+										<property name="dx.filepath" value="build-tools/29.0.3/lib/dx.jar" />
 
 										<echo>Building shell</echo>
 										<delete dir="${project.basedir}/target/dx" />
@@ -131,7 +128,7 @@
 										<exec executable="java" failonerror="true">
 											<arg value="-Xmx1024M" />
 											<arg value="-jar" />
-											<arg value="${android.sdk.path}/build-tools/29.0.3/lib/dx.jar" />
+											<arg value="${android.sdk.path}/${dx.filepath}" />
 											<arg value="--verbose" />
 											<arg value="--dex" />
 											<arg value="--output=${project.basedir}/../../${deploy.path}/data/android/shell.jar" />
@@ -149,7 +146,7 @@
 										<exec executable="java" failonerror="true">
 											<arg value="-Xmx1024M" />
 											<arg value="-jar" />
-											<arg value="${android.sdk.path}/build-tools/29.0.3/lib/dx.jar" />
+											<arg value="${android.sdk.path}/${dx.filepath}" />
 											<arg value="--verbose" />
 											<arg value="--dex" />
 											<arg value="--output=${project.basedir}/../../${deploy.path}/data/android/metstage.jar" />
@@ -167,7 +164,7 @@
 										<exec executable="java" failonerror="true">
 											<arg value="-Xmx1024M" />
 											<arg value="-jar" />
-											<arg value="${android.sdk.path}/build-tools/29.0.3/lib/dx.jar" />
+											<arg value="${android.sdk.path}/${dx.filepath}" />
 											<arg value="--verbose" />
 											<arg value="--dex" />
 											<arg value="--output=${project.basedir}/../../${deploy.path}/data/android/meterpreter.jar" />
@@ -182,7 +179,7 @@
 										<exec executable="java" failonerror="true">
 											<arg value="-Xmx1024M" />
 											<arg value="-jar" />
-											<arg value="${android.sdk.path}/build-tools/29.0.3/lib/dx.jar" />
+											<arg value="${android.sdk.path}/${dx.filepath}" />
 											<arg value="--verbose" />
 											<arg value="--dex" />
 											<arg value="--output=${project.basedir}/../../${deploy.path}/data/android/meterpreter.dex" />
diff --git a/java/version-compatibility-check/android-api/pom.xml b/java/version-compatibility-check/android-api/pom.xml
index a73160528..f544ef983 100644
--- a/java/version-compatibility-check/android-api/pom.xml
+++ b/java/version-compatibility-check/android-api/pom.xml
@@ -32,8 +32,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.0</version>
 				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
+					<source>1.8</source>
+					<target>1.8</target>
 				</configuration>
 			</plugin>
 			<plugin>

From bb05a5850e3c7eb28000899d0e904b6b8e37d37e Mon Sep 17 00:00:00 2001
From: soroshsabz <soorosh_abi@hotmail.com>
Date: Fri, 10 Jan 2025 22:47:56 +0330
Subject: [PATCH 3/5] Update dockerfile

---
 docker/Dockerfile | 1 +
 java/README.md    | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index cd42cdead..d56146c56 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -41,6 +41,7 @@ RUN wget http://dl.google.com/android/android-sdk_r24-linux.tgz && \
 RUN echo y | /usr/local/android-sdk/tools/android update sdk --filter tools --no-ui -a
 RUN echo y | /usr/local/android-sdk/tools/android update sdk --filter platform-tools --no-ui -a
 RUN echo y | /usr/local/android-sdk/tools/android update sdk --filter build-tools-23.0.0 --no-ui -a
+RUN echo y | /usr/local/android-sdk/tools/android update sdk --filter build-tools-29.0.3 --no-ui -a
 RUN echo y | /usr/local/android-sdk/tools/android update sdk --filter android-10 --no-ui -a
 RUN echo y | /usr/local/android-sdk/tools/android update sdk --filter android-19 --no-ui -a
 RUN echo y | /usr/local/android-sdk/tools/android update sdk --filter android-3 --no-ui -a
diff --git a/java/README.md b/java/README.md
index 3f0e48ec8..e55960b25 100644
--- a/java/README.md
+++ b/java/README.md
@@ -2,7 +2,7 @@
 
 1. Install Maven and Java 1.8, this will depend on your OS
 1. Download the [Android SDK](https://developer.android.com/sdk/index.html)
-1. Install Android SDK Platforms 3, 10 and 19, and update the "Android SDK Tools" and "Android SDK Platform-tools"
+1. Install Android SDK Platforms 3, 10, 19 and 29, and update the "Android SDK Tools" and "Android SDK Platform-tools" (if you does not find android sdk tools, you must uncheck `Hide Obsolete Packages` in Android SDK Manager)
 1. Compile the Android and Java Meterpreter, which deploys to the `../metasploit-framework` folder
 ```
 mvn package -Dandroid.sdk.path=/path/to/android-sdk -Dandroid.release=true -P deploy
@@ -43,6 +43,13 @@ make clean
 make android
 ```
 
+## Building on Windows
+
+```powershell
+# Important: Ensure Java 1.8 is used when compiling
+$env:JAVA_HOME="C:\Program Files\Java\jdk-1.8"
+```
+
 ## Building on OSX
 
 ```

From 7da722144402018c27e78483e9ed0b6853210b16 Mon Sep 17 00:00:00 2001
From: soroshsabz <soorosh_abi@hotmail.com>
Date: Fri, 10 Jan 2025 22:52:35 +0330
Subject: [PATCH 4/5] Update dockerfile

---
 docker/Dockerfile                   | 2 +-
 java/README.md                      | 1 +
 java/androidpayload/app/pom.xml     | 2 +-
 java/androidpayload/library/pom.xml | 4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index d56146c56..24677ff57 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -40,7 +40,7 @@ RUN wget http://dl.google.com/android/android-sdk_r24-linux.tgz && \
     mv android-sdk-linux /usr/local/android-sdk
 RUN echo y | /usr/local/android-sdk/tools/android update sdk --filter tools --no-ui -a
 RUN echo y | /usr/local/android-sdk/tools/android update sdk --filter platform-tools --no-ui -a
-RUN echo y | /usr/local/android-sdk/tools/android update sdk --filter build-tools-23.0.0 --no-ui -a
+RUN echo y | /usr/local/android-sdk/tools/android update sdk --filter build-tools-23.0.3 --no-ui -a
 RUN echo y | /usr/local/android-sdk/tools/android update sdk --filter build-tools-29.0.3 --no-ui -a
 RUN echo y | /usr/local/android-sdk/tools/android update sdk --filter android-10 --no-ui -a
 RUN echo y | /usr/local/android-sdk/tools/android update sdk --filter android-19 --no-ui -a
diff --git a/java/README.md b/java/README.md
index e55960b25..935a9a855 100644
--- a/java/README.md
+++ b/java/README.md
@@ -3,6 +3,7 @@
 1. Install Maven and Java 1.8, this will depend on your OS
 1. Download the [Android SDK](https://developer.android.com/sdk/index.html)
 1. Install Android SDK Platforms 3, 10, 19 and 29, and update the "Android SDK Tools" and "Android SDK Platform-tools" (if you does not find android sdk tools, you must uncheck `Hide Obsolete Packages` in Android SDK Manager)
+1. Install Android SDK Build-Tools 23.0.3
 1. Compile the Android and Java Meterpreter, which deploys to the `../metasploit-framework` folder
 ```
 mvn package -Dandroid.sdk.path=/path/to/android-sdk -Dandroid.release=true -P deploy
diff --git a/java/androidpayload/app/pom.xml b/java/androidpayload/app/pom.xml
index bd66db017..ce5faed4c 100644
--- a/java/androidpayload/app/pom.xml
+++ b/java/androidpayload/app/pom.xml
@@ -64,7 +64,7 @@
 					<sdk>
 						<!-- platform or api level (api level 10 = platform 2.3)-->
 						<platform>10</platform>
-						<buildTools>29.0.3</buildTools>
+						<buildTools>23.0.3</buildTools>
 					</sdk>
 					<proguard>
 						<skip>false</skip>
diff --git a/java/androidpayload/library/pom.xml b/java/androidpayload/library/pom.xml
index 6db402225..35569ae0f 100644
--- a/java/androidpayload/library/pom.xml
+++ b/java/androidpayload/library/pom.xml
@@ -81,7 +81,7 @@
 					<sdk>
 						<!-- platform or api level (api level 19 = platform 4.4 (kitkat))-->
 						<platform>19</platform>
-						<buildTools>29.0.3</buildTools>
+						<buildTools>23.0.3</buildTools>
 					</sdk>
 				</configuration>
 			</plugin>
@@ -113,7 +113,7 @@
 								</goals>
 								<configuration>
 									<target>
-										<property name="dx.filepath" value="build-tools/29.0.3/lib/dx.jar" />
+										<property name="dx.filepath" value="build-tools/23.0.3/lib/dx.jar" />
 
 										<echo>Building shell</echo>
 										<delete dir="${project.basedir}/target/dx" />

From b7193ac5cd7ab9b23e0a69a41b9f5b256413efab Mon Sep 17 00:00:00 2001
From: soroshsabz <soorosh_abi@hotmail.com>
Date: Fri, 10 Jan 2025 22:57:38 +0330
Subject: [PATCH 5/5] Update dockerfile

---
 docker/Dockerfile                                    | 1 -
 java/androidpayload/app/pom.xml                      | 4 ++--
 java/androidpayload/library/pom.xml                  | 4 ++--
 java/pom.xml                                         | 4 ++--
 java/version-compatibility-check/android-api/pom.xml | 4 ++--
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 24677ff57..4aaa4db59 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -41,7 +41,6 @@ RUN wget http://dl.google.com/android/android-sdk_r24-linux.tgz && \
 RUN echo y | /usr/local/android-sdk/tools/android update sdk --filter tools --no-ui -a
 RUN echo y | /usr/local/android-sdk/tools/android update sdk --filter platform-tools --no-ui -a
 RUN echo y | /usr/local/android-sdk/tools/android update sdk --filter build-tools-23.0.3 --no-ui -a
-RUN echo y | /usr/local/android-sdk/tools/android update sdk --filter build-tools-29.0.3 --no-ui -a
 RUN echo y | /usr/local/android-sdk/tools/android update sdk --filter android-10 --no-ui -a
 RUN echo y | /usr/local/android-sdk/tools/android update sdk --filter android-19 --no-ui -a
 RUN echo y | /usr/local/android-sdk/tools/android update sdk --filter android-3 --no-ui -a
diff --git a/java/androidpayload/app/pom.xml b/java/androidpayload/app/pom.xml
index ce5faed4c..a9f271377 100644
--- a/java/androidpayload/app/pom.xml
+++ b/java/androidpayload/app/pom.xml
@@ -77,8 +77,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.0</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>1.7</source>
+                    <target>1.7</target>
                 </configuration>
             </plugin>
 		</plugins>
diff --git a/java/androidpayload/library/pom.xml b/java/androidpayload/library/pom.xml
index 35569ae0f..30f2a5fed 100644
--- a/java/androidpayload/library/pom.xml
+++ b/java/androidpayload/library/pom.xml
@@ -90,8 +90,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.0</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>1.6</source>
+                    <target>1.6</target>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/java/pom.xml b/java/pom.xml
index 9e8294fd7..3610dcff3 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -26,8 +26,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.0</version>
 				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
+					<source>1.5</source>
+					<target>1.5</target>
 					<debug>true</debug> <!-- http://stackoverflow.com/q/4220083/90203 -->
 					<debuglevel>none</debuglevel>
 				</configuration>
diff --git a/java/version-compatibility-check/android-api/pom.xml b/java/version-compatibility-check/android-api/pom.xml
index f544ef983..8a466cbef 100644
--- a/java/version-compatibility-check/android-api/pom.xml
+++ b/java/version-compatibility-check/android-api/pom.xml
@@ -32,8 +32,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.0</version>
 				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
+					<source>1.5</source>
+					<target>1.5</target>
 				</configuration>
 			</plugin>
 			<plugin>