Fixed Main Project

Author: shai-almog

.github/scripts/build-thirdparty-app.sh

@@ -22,7 +22,7 @@ jobs:
         mkdir -p ~/.codenameone
         wget https://github.com/codenameone/CodenameOne/raw/refs/heads/master/maven/CodeNameOneBuildClient.jar -O ~/.codenameone/CodeNameOneBuildClient.jar
     - name: Build with Maven
-      run: mvn install -DskipTests
+      run: cd cn1-bluetooth && mvn install -DskipTests && cd ..
 
   android:
     runs-on: ubuntu-22.04
@@ -46,27 +46,31 @@ jobs:
           mkdir -p ~/.codenameone
           wget https://github.com/codenameone/CodenameOne/raw/refs/heads/master/maven/CodeNameOneBuildClient.jar -O ~/.codenameone/CodeNameOneBuildClient.jar
       - name: Install Libraries (JDK 11)
-        run: mvn install -DskipTests
+        run: cd cn1-bluetooth && mvn install -DskipTests && cd ..
       - name: Enable KVM for Android emulator
         run: |
           echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
           sudo udevadm control --reload-rules
           sudo udevadm trigger --name-match=kvm
+      - name: Install Framebuffer
+        run: sudo apt-get update && sudo apt-get install xvfb
       - name: Build BTDemo Source (JDK 17)
         env:
           APP_DIR: BTDemo
           JAVA_HOME: ${{ env.JAVA17_HOME }}
         run: |
-          .github/scripts/build-thirdparty-app.sh android
+          cd BTDemo
+          xvfb-run -a ./mvnw cn1:build -e -Dcodename1.platform=android -Dcodename1.buildTarget=android-source
+          cd ..
       - name: Compile APK (Gradle)
         env:
           JAVA_HOME: ${{ env.JAVA17_HOME }}
         run: |
           # Locate the Gradle project root
-          GRADLE_ROOT=$(find BTDemo/target -name "gradlew" -type f -exec dirname {} \; | head -n 1)
+          GRADLE_ROOT=$(find BTDemo/android/target -name "gradlew" -type f -exec dirname {} \; | head -n 1)
 
           if [[ -z "$GRADLE_ROOT" ]]; then
-            echo "Error: Gradle project not found in BTDemo/target"
+            echo "Error: Gradle project not found in BTDemo/android/target"
             echo "Listing directories recursively:"
             ls -R .
             exit 1
@@ -110,22 +114,25 @@ jobs:
           mkdir -p ~/.codenameone
           wget https://github.com/codenameone/CodenameOne/raw/refs/heads/master/maven/CodeNameOneBuildClient.jar -O ~/.codenameone/CodeNameOneBuildClient.jar
       - name: Install Libraries (JDK 11)
-        run: mvn install -DskipTests
+        run: cd cn1-bluetooth && mvn install -DskipTests && cd ..
       - name: Build BTDemo Source (Maven)
         env:
           APP_DIR: BTDemo
           BUILD_TARGET: ios-source
         run: |
-          .github/scripts/build-thirdparty-app.sh ios
+          cd BTDemo
+          ./mvnw install
+          ./mvnw cn1:build -Dcodename1.platform=ios -Dcodename1.buildTarget=ios-source
+          cd ..
       - name: Compile iOS App (Xcode)
         run: |
           # Find the generated Xcode project
-          XCODE_PROJ=$(find BTDemo/target -name "*.xcodeproj" -type d | head -n 1)
+          XCODE_PROJ=$(find BTDemo/ios/target -name "*.xcodeproj" -type d | head -n 1)
 
           if [[ -z "$XCODE_PROJ" ]]; then
             echo "Error: Xcode project not found in BTDemo/target"
-            echo "Listing BTDemo/target recursively:"
-            ls -R BTDemo/target
+            echo "Listing BTDemo/ios/target recursively:"
+            ls -R BTDemo/ios/target
             exit 1
           fi
 

.github/workflows/maven.yml

@@ -0,0 +1,117 @@
+/*
+ * Copyright 2007-present the original author or authors.
+ *
+ * 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.
+ */
+import java.net.*;
+import java.io.*;
+import java.nio.channels.*;
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+    private static final String WRAPPER_VERSION = "0.5.6";
+    /**
+     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
+     */
+    private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
+        + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
+
+    /**
+     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
+     * use instead of the default one.
+     */
+    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
+            ".mvn/wrapper/maven-wrapper.properties";
+
+    /**
+     * Path where the maven-wrapper.jar will be saved to.
+     */
+    private static final String MAVEN_WRAPPER_JAR_PATH =
+            ".mvn/wrapper/maven-wrapper.jar";
+
+    /**
+     * Name of the property which should be used to override the default download url for the wrapper.
+     */
+    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+    public static void main(String args[]) {
+        System.out.println("- Downloader started");
+        File baseDirectory = new File(args[0]);
+        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
+
+        // If the maven-wrapper.properties exists, read it and check if it contains a custom
+        // wrapperUrl parameter.
+        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
+        String url = DEFAULT_DOWNLOAD_URL;
+        if(mavenWrapperPropertyFile.exists()) {
+            FileInputStream mavenWrapperPropertyFileInputStream = null;
+            try {
+                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
+                Properties mavenWrapperProperties = new Properties();
+                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
+                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
+            } catch (IOException e) {
+                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
+            } finally {
+                try {
+                    if(mavenWrapperPropertyFileInputStream != null) {
+                        mavenWrapperPropertyFileInputStream.close();
+                    }
+                } catch (IOException e) {
+                    // Ignore ...
+                }
+            }
+        }
+        System.out.println("- Downloading from: " + url);
+
+        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
+        if(!outputFile.getParentFile().exists()) {
+            if(!outputFile.getParentFile().mkdirs()) {
+                System.out.println(
+                        "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
+            }
+        }
+        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
+        try {
+            downloadFileFromURL(url, outputFile);
+            System.out.println("Done");
+            System.exit(0);
+        } catch (Throwable e) {
+            System.out.println("- Error downloading");
+            e.printStackTrace();
+            System.exit(1);
+        }
+    }
+
+    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
+        if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
+            String username = System.getenv("MVNW_USERNAME");
+            char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
+            Authenticator.setDefault(new Authenticator() {
+                @Override
+                protected PasswordAuthentication getPasswordAuthentication() {
+                    return new PasswordAuthentication(username, password);
+                }
+            });
+        }
+        URL website = new URL(urlString);
+        ReadableByteChannel rbc;
+        rbc = Channels.newChannel(website.openStream());
+        FileOutputStream fos = new FileOutputStream(destination);
+        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+        fos.close();
+        rbc.close();
+    }
+
+}

BTDemo/.mvn/jvm.config

@@ -0,0 +1,2 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

BTDemo/.mvn/wrapper/MavenWrapperDownloader.java

@@ -0,0 +1 @@
+{"recommendations": ["vscjava.vscode-java-pack"]}

BTDemo/.mvn/wrapper/maven-wrapper.jar

@@ -0,0 +1,58 @@
+{"maven.terminal.favorites": [
+  {
+    "alias": "Cloud > iOS Release Build",
+    "command": "\"package\" \"-DskipTests\" \"-Dcodename1.platform=ios\" \"-Dcodename1.buildTarget=ios-device-release\" \"-U\" \"-e\""
+  },
+  {
+    "alias": "Tools > Codename One Settings",
+    "command": "\"cn1:settings\" \"-U\" \"-e\""
+  },
+  {
+    "alias": "Run in Simulator",
+    "command": "\"verify\" \"-Psimulator\" \"-DskipTests\" \"-Dcodename1.platform=javase\" \"-e\""
+  },
+  {
+    "alias": "Cloud > Mac Desktop Build",
+    "command": "\"package\" \"-DskipTests\" \"-Dcodename1.platform=javase\" \"-Dcodename1.buildTarget=mac-os-x-desktop\" \"-U\" \"-e\""
+  },
+  {
+    "alias": "Cloud > Android Build",
+    "command": "\"package\" \"-DskipTests\" \"-Dcodename1.platform=android\" \"-Dcodename1.buildTarget=android-device\" \"-U\" \"-e\""
+  },
+  {
+    "alias": "Tools > Update Codename One",
+    "command": "\"cn1:update\" \"-U\" \"-e\""
+  },
+  {
+    "alias": "Cloud > iOS Debug Build",
+    "command": "\"package\" \"-DskipTests\" \"-Dcodename1.platform=ios\" \"-Dcodename1.buildTarget=ios-device\" \"-U\" \"-e\""
+  },
+  {
+    "alias": "Local > Xcode iOS Project",
+    "command": "\"package\" \"-DskipTests\" \"-Dcodename1.platform=ios\" \"-Dcodename1.buildTarget=ios-source\" \"-U\" \"-e\""
+  },
+  {
+    "alias": "Cloud > Javascript Build",
+    "command": "\"package\" \"-DskipTests\" \"-Dcodename1.platform=javascript\" \"-Dcodename1.buildTarget=javascript\" \"-U\" \"-e\""
+  },
+  {
+    "alias": "Cloud > Windows Desktop Build",
+    "command": "\"package\" \"-DskipTests\" \"-Dcodename1.platform=javase\" \"-Dcodename1.buildTarget=windows-desktop\" \"-U\" \"-e\""
+  },
+  {
+    "alias": "Run as Desktop App",
+    "command": "\"verify\" \"-Prun-desktop\" \"-DskipTests\" \"-Dcodename1.platform=javase\" \"-e\""
+  },
+  {
+    "alias": "Cloud > Windows Device Build (UWP)",
+    "command": "\"package\" \"-DskipTests\" \"-Dcodename1.platform=win\" \"-Dcodename1.buildTarget=windows-device\" \"-U\" \"-e\""
+  },
+  {
+    "alias": "Local > Gradle Android Project",
+    "command": "\"package\" \"-DskipTests\" \"-Dcodename1.platform=android\" \"-Dcodename1.buildTarget=android-source\" \"-U\" \"-e\""
+  },
+  {
+    "alias": "Local > Cross-platform (JavaSE) Desktop App",
+    "command": "\"-Pexecutable-jar\" \"package\" \"-Dcodename1.platform=javase\" \"-DskipTests\" \"-U\" \"-e\""
+  }
+]}