@wisdomgarden/capacitor-plugin-beacon 0.0.1 → 0.0.2

package/ios/Plugin/Plugin.swift

@@ -9,6 +9,8 @@ import Foundation
 public class Beacon: CAPPlugin, CBPeripheralManagerDelegate,
     CBCentralManagerDelegate
 {
+    private static let TAG = "WisdomGardenBeacon"
+
     private var peripheralManager: CBPeripheralManager?
     private var centralManager: CBCentralManager?
 
@@ -20,10 +22,17 @@ public class Beacon: CAPPlugin, CBPeripheralManagerDelegate,
 
     private var allowDuplicatesKey = true
 
-    private var rollcallId = 0
-    private var nonce = ""
     private var message = ""
 
+    /**
+     * Helper to send tagged logs to JS bridge with sequence prefix and print to Xcode console.
+     */
+    private func logToJsWithTag(_ seq: String, _ msg: String) {
+        let formattedMessage = "\(seq): \(msg)"
+        print("[\(Beacon.TAG)] \(formattedMessage)")
+        super.bridge.logToJs("[\(Beacon.TAG)] \(formattedMessage)")
+    }
+
     @objc func parseMessage(_ call: CAPPluginCall) {
         let message = call.getString("message")
         let result = BeaconUtils.parseMessage(message)
@@ -32,147 +41,123 @@ public class Beacon: CAPPlugin, CBPeripheralManagerDelegate,
 
     @objc func initialize(_ call: CAPPluginCall) {
         allowDuplicatesKey = call.getBool("allowDuplicatesKey") ?? true
+        logToJsWithTag("[SEQ-00]", "Plugin Initialized. allowDuplicates: \(allowDuplicatesKey)")
         call.resolve()
     }
 
-    func startAdvertising() {
-        super.bridge.logToJs("[Debug] startAdvertising 12")
-        if peripheralManager == nil {
-            return
-        }
-
-        if isBroadcasting == true {
-            return
-        }
-        super.bridge.logToJs("[Debug] startAdvertising broadcasting 13")
-        isBroadcasting = true
-
-        let advertisementData: [String: Any] = [
-            CBAdvertisementDataServiceUUIDsKey: [CBUUID(string: BeaconUtils.WG_UUID)],
-            CBAdvertisementDataLocalNameKey: message,
-        ]
-
-        super.bridge.logToJs("[Debug] startAdvertising broadcasting 14")
-        peripheralManager?.startAdvertising(advertisementData)
-        super.bridge.logToJs("[Debug] startAdvertising broadcasting 15")
-    }
+    // MARK: - Broadcasting (Peripheral)
 
     @objc func startBroadcasting(_ call: CAPPluginCall) {
-        super.bridge.logToJs("[Debug] startBroadcasting 11")
+        logToJsWithTag("[SEQ-10]", "startBroadcasting invoked")
 
-        if let message = call.getString("message"),
-            message.count == BeaconUtils.message_max_length
-        {
-            self.message = message
+        if let inputMsg = call.getString("message"), inputMsg.count == BeaconUtils.message_max_length {
+            self.message = inputMsg
         } else {
-            guard let rollcallId = call.getInt("rollcallId") else {
-                call.reject("rollcallId is required")
+            guard let rId = call.getInt("rollcallId"), let nce = call.getString("nonce") else {
+                logToJsWithTag("[ERR]", "Missing rollcallId or nonce")
+                call.reject("rollcallId and nonce are required")
                 return
             }
-            guard let nonce = call.getString("nonce") else {
-                call.reject("nonce is required")
-                return
-            }
-
-            self.rollcallId = rollcallId
-            self.nonce = nonce
-
-            self.message = BeaconUtils.buildMessage(rollcallId: rollcallId, nonce: nonce)
+            self.message = BeaconUtils.buildMessage(rollcallId: rId, nonce: nce)
         }
 
-        super.bridge.logToJs("[Debug] startBroadcasting 11.1")
+        logToJsWithTag("[SEQ-11]", "Payload prepared: \(self.message)")
 
         if isBroadcasting {
+            logToJsWithTag("[SEQ-12]", "Already broadcasting, skipping")
             call.resolve()
             return
         }
-        super.bridge.logToJs("[Debug] startBroadcasting 11.2")
 
         needBroadcasting = true
 
         if peripheralManager == nil {
-            peripheralManager = CBPeripheralManager(
-                delegate: self,
-                queue: nil
-            )
-            super.bridge.logToJs("[Debug] startBroadcasting 11.2.1")
-        }
-
-        if peripheralManager?.state == .poweredOn {
+            peripheralManager = CBPeripheralManager(delegate: self,queue: nil)
+            logToJsWithTag("[SEQ-13]", "Initializing Peripheral Manager")
+        }else if peripheralManager?.state == .poweredOn {
             self.startAdvertising()
-            super.bridge.logToJs("[Debug] startBroadcasting 11.2.2")
         }
-        super.bridge.logToJs("[Debug] startBroadcasting 11.3")
+
+        logToJsWithTag("[SEQ-16]", "startBroadcasting logic completed")
 
         call.resolve()
     }
 
+
+    func startAdvertising() {
+        guard let pManager = peripheralManager, pManager.state == .poweredOn else { return }
+        if isBroadcasting { return }
+
+        isBroadcasting = true
+
+        // iOS Strategy: Use LocalName for the message to support background and cross-platform scanning
+        let prefixedMessage = BeaconUtils.addPrefixToString(message: self.message)
+        let advertisementData: [String: Any] = [
+            CBAdvertisementDataServiceUUIDsKey: [CBUUID(string: BeaconUtils.WG_UUID)],
+            CBAdvertisementDataLocalNameKey: prefixedMessage,
+        ]
+
+        logToJsWithTag("[SEQ-14]", "Calling peripheralManager.startAdvertising with name: \(prefixedMessage)")
+        peripheralManager?.startAdvertising(advertisementData)
+    }
+
     @objc func stopBroadcasting(_ call: CAPPluginCall) {
+        logToJsWithTag("[SEQ-20]", "stopBroadcasting called")
         peripheralManager?.stopAdvertising()
         isBroadcasting = false
         needBroadcasting = false
         call.resolve()
     }
 
-    func scanForPeripherals() {
-        super.bridge.logToJs("[Debug] scanForPeripherals 22")
-        if centralManager == nil {
+    // MARK: - Monitoring (Central)
+    @objc func startMonitoring(_ call: CAPPluginCall) {
+        logToJsWithTag("[SEQ-30]", "startMonitoring invoked")
+        if isMonitoring {
+            logToJsWithTag("[SEQ-31]", "Already monitoring, skipping")
+            call.resolve()
             return
         }
+        needMonitoring = true
 
-        if isMonitoring == true {
-            return
+        if centralManager == nil {
+            centralManager = CBCentralManager(delegate: self, queue: nil)
+            logToJsWithTag("[SEQ-32]", "Initializing Central Manager")
+        }else if centralManager?.state == .poweredOn {
+            self.scanForPeripherals()
         }
+        logToJsWithTag("[SEQ-36]", "startMonitoring logic completed")
+
+        call.resolve()
+    }
+
+    func scanForPeripherals() {
+        guard let cManager = centralManager, cManager.state == .poweredOn else { return }
+        if isMonitoring { return }
         super.bridge.logToJs("[Debug] scanForPeripherals monitoring 23")
         isMonitoring = true
 
         let options: [String: Any] = [
             CBCentralManagerScanOptionAllowDuplicatesKey: allowDuplicatesKey,
-            CBCentralManagerScanOptionSolicitedServiceUUIDsKey: [
-                CBUUID(string: BeaconUtils.WG_UUID)
-            ],
         ]
-        super.bridge.logToJs("[Debug] scanForPeripherals monitoring 24")
+        logToJsWithTag("[SEQ-33]", "Calling centralManager.scanForPeripherals")
 
         centralManager?.scanForPeripherals(
             withServices: [CBUUID(string: BeaconUtils.WG_UUID)],
             options: options
         )
-        super.bridge.logToJs("[Debug] scanForPeripherals monitoring 25")
-    }
-
-    @objc func startMonitoring(_ call: CAPPluginCall) {
-        super.bridge.logToJs("[Debug] startMonitoring 21")
-        if isMonitoring {
-            call.resolve()
-            return
-        }
-        needMonitoring = true
-        super.bridge.logToJs("[Debug] startMonitoring 21.1")
-
-        if centralManager == nil {
-            centralManager = CBCentralManager(delegate: self, queue: nil)
-            super.bridge.logToJs("[Debug] startMonitoring 21.1.1")
-        }
-        super.bridge.logToJs("[Debug] startMonitoring 21.2")
-
-        if centralManager?.state == .poweredOn {
-            super.bridge.logToJs("[Debug] startMonitoring 21.2.1")
-            self.scanForPeripherals()
-        }
-        super.bridge.logToJs("[Debug] startMonitoring 21.3")
-
-        call.resolve()
     }
 
     @objc func stopMonitoring(_ call: CAPPluginCall) {
+        logToJsWithTag("[SEQ-40]", "stopMonitoring called")
         centralManager?.stopScan()
         isMonitoring = false
         needMonitoring = false
         call.resolve()
     }
 
+    // MARK: - Lifecycle
     @objc func cleanup(_ call: CAPPluginCall) {
+        logToJsWithTag("[SEQ-90]", "Cleanup: Resetting all states")
         peripheralManager?.stopAdvertising()
         centralManager?.stopScan()
 
@@ -191,39 +176,29 @@ public class Beacon: CAPPlugin, CBPeripheralManagerDelegate,
     public func peripheralManagerDidUpdateState(
         _ peripheral: CBPeripheralManager
     ) {
-        super.bridge.logToJs(
-            "[Beacon] Peripheral manager state changed to: \(peripheral.state.rawValue)"
-        )
+        logToJsWithTag("[EVT]", "Peripheral State: \(peripheral.state.rawValue)")
 
         switch peripheral.state {
         case .poweredOn:
-            super.bridge.logToJs("[Beacon] Peripheral manager is powered on")
-            notifyListeners(
-                "stateUpdated",
-                data: ["type": "peripheral", "state": "poweredOn"]
-            )
+            logToJsWithTag("[SEQ-15]", "Peripheral powered on")
+            notifyListeners("stateUpdated",data: ["type": "peripheral", "state": "poweredOn"])
         case .poweredOff:
-            super.bridge.logToJs("[Beacon] Peripheral manager is powered off")
-            notifyListeners(
-                "stateUpdated",
-                data: ["type": "peripheral", "state": "poweredOff"]
-            )
+        logToJsWithTag("[SEQ-15]", "Peripheral powered off")
+            notifyListeners("stateUpdated",data: ["type": "peripheral", "state": "poweredOff"])
         case .unauthorized:
-            super.bridge.logToJs("[Beacon] Peripheral manager is unauthorized")
+            logToJsWithTag("[SEQ-15]", "Peripheral manager is unauthorized")
             notifyListeners(
                 "stateUpdated",
                 data: ["type": "peripheral", "state": "unauthorized"]
             )
         case .unsupported:
-            super.bridge.logToJs("[Beacon] Peripheral manager is unsupported")
+        logToJsWithTag("[SEQ-15]", "Peripheral manager is unsupported")
             notifyListeners(
                 "stateUpdated",
                 data: ["type": "peripheral", "state": "unsupported"]
             )
         default:
-            super.bridge.logToJs(
-                "[Beacon] Peripheral manager state: \(peripheral.state.rawValue)"
-            )
+        logToJsWithTag("[SEQ-15]", "Peripheral manager state: \(peripheral.state.rawValue)")
             notifyListeners(
                 "stateUpdated",
                 data: [
@@ -234,14 +209,10 @@ public class Beacon: CAPPlugin, CBPeripheralManagerDelegate,
 
         if needBroadcasting {
             if peripheral.state == .poweredOn {
-                super.bridge.logToJs(
-                    "[Debug] peripheralManagerDidUpdateState needBroadcasting poweredOn"
-                )
+                logToJsWithTag("[SEQ-15-1]","peripheralManagerDidUpdateState needBroadcasting poweredOn")
                 self.startAdvertising()
             } else {
-                super.bridge.logToJs(
-                    "[Debug] peripheralManagerDidUpdateState needBroadcasting but stopAdvertising"
-                )
+                logToJsWithTag("[SEQ-15-2]","peripheralManagerDidUpdateState needBroadcasting but stopAdvertising")
                 peripheralManager?.stopAdvertising()
                 isBroadcasting = false
             }
@@ -251,23 +222,21 @@ public class Beacon: CAPPlugin, CBPeripheralManagerDelegate,
     // MARK: - CBCentralManagerDelegate
 
     public func centralManagerDidUpdateState(_ central: CBCentralManager) {
-        super.bridge.logToJs(
-            "[Beacon] Central manager state changed to: \(central.state.rawValue)"
-        )
+       logToJsWithTag("[EVT]", "Central State: \(central.state.rawValue)")
 
         switch central.state {
         case .poweredOn:
-            super.bridge.logToJs("[Beacon] Central manager is powered on")
+            logToJsWithTag("[SEQ-34]", "Central manager is powered on")
             notifyListeners("bluetoothStateChanged", data: ["enabled": true])
         case .poweredOff:
-            super.bridge.logToJs("[Beacon] Central manager is powered off")
+            logToJsWithTag("[SEQ-34]", "Central manager is powered off")
             notifyListeners(
                 "stateError",
                 data: ["type": "central", "state": "poweredOff"]
             )
             notifyListeners("bluetoothStateChanged", data: ["enabled": false])
         case .unauthorized:
-            super.bridge.logToJs("[Beacon] Central manager is unauthorized")
+            logToJsWithTag("[SEQ-34]", "Central manager is unauthorized")
             notifyListeners(
                 "stateError",
                 data: ["type": "central", "state": "unauthorized"]
@@ -277,7 +246,7 @@ public class Beacon: CAPPlugin, CBPeripheralManagerDelegate,
                 data: ["enabled": false, "error": "unauthorized"]
             )
         case .unsupported:
-            super.bridge.logToJs("[Beacon] Central manager is unsupported")
+            logToJsWithTag("[SEQ-34]", "Central manager is unsupported")
             notifyListeners(
                 "stateError",
                 data: ["type": "central", "state": "unsupported"]
@@ -287,9 +256,7 @@ public class Beacon: CAPPlugin, CBPeripheralManagerDelegate,
                 data: ["enabled": false, "error": "unsupported"]
             )
         default:
-            super.bridge.logToJs(
-                "[Beacon] Central manager state: \(central.state.rawValue)"
-            )
+            logToJsWithTag("[SEQ-34]", "Central manager state: \(central.state.rawValue)")
             notifyListeners(
                 "stateError",
                 data: ["type": "central", "state": central.state.rawValue]
@@ -302,14 +269,10 @@ public class Beacon: CAPPlugin, CBPeripheralManagerDelegate,
 
         if needMonitoring {
             if central.state == .poweredOn {
-                super.bridge.logToJs(
-                    "[Debug] centralManagerDidUpdateState needMonitoring poweredOn"
-                )
+                logToJsWithTag("[SEQ-34-1]", "centralManagerDidUpdateState needMonitoring poweredOn")
                 self.scanForPeripherals()
             } else {
-                super.bridge.logToJs(
-                    "[Debug] centralManagerDidUpdateState needMonitoring but stopScan"
-                )
+                logToJsWithTag("[SEQ-34-1]", "centralManagerDidUpdateState needMonitoring but stopScan")
                 centralManager?.stopScan()
                 isMonitoring = false
             }
@@ -322,9 +285,25 @@ public class Beacon: CAPPlugin, CBPeripheralManagerDelegate,
         advertisementData: [String: Any],
         rssi RSSI: NSNumber
     ) {
-        if let message = advertisementData[CBAdvertisementDataLocalNameKey]
-            as? String
-        {
+
+        var finalMessage: String?
+
+        // Strategy 1: Primary - Extract from Manufacturer Data (Android-style packets)
+        if let vendorData = advertisementData[CBAdvertisementDataManufacturerDataKey] as? Data {
+            finalMessage = BeaconUtils.extractMessageFromBytes(vendorData)
+        } else {
+            logToJsWithTag("[SEQ-51]", "No valid message found in manufacturer data key")
+        }
+
+        // Strategy 2: Fallback - Extract from LocalName (iOS-style packets)
+        if finalMessage == nil,let name = advertisementData[CBAdvertisementDataLocalNameKey] as? String {
+            finalMessage = BeaconUtils.extractMessageFromDeviceName(name)
+        } else {
+            logToJsWithTag("[SEQ-52]", "No valid message found in local name key")
+        }
+
+        if let message = finalMessage {
+            logToJsWithTag("[SEQ-55]", "Valid Beacon Resolved: \(message) | RSSI: \(RSSI)")
             let peripheralId = peripheral.identifier.uuidString
             let rssiValue = RSSI.intValue
 
@@ -337,6 +316,8 @@ public class Beacon: CAPPlugin, CBPeripheralManagerDelegate,
                     "timestamp": Int64(Date().timeIntervalSince1970 * 1000),
                 ]
             )
+        } else {
+            logToJsWithTag("[SEQ-55-F]", "No valid message found in scan result")
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wisdomgarden/capacitor-plugin-beacon",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "Capacitor plugin for Bluetooth beacon broadcasting and monitoring",
   "main": "dist/plugin.js",
   "module": "dist/esm/index.js",
@@ -36,8 +36,10 @@
   "files": [
     "dist/",
     "ios/",
-    "android/",
-    "WisdomgardenCapacitorPluginBeacon.podspec"
+    "android/src/main/",
+    "android/build.gradle",
+    "WisdomgardenCapacitorPluginBeacon.podspec",
+    "CHANGE-LOG.md"
   ],
   "keywords": [
     "capacitor",
@@ -60,5 +62,9 @@
   },
   "bugs": {
     "url": "git@gitlab.tronclass.com.cn:lms/capacitor-plugin-beacon.git/issues"
+  },
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org/"
   }
 }

package/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists

package/android/gradle.properties

@@ -1,24 +0,0 @@
-# Project-wide Gradle settings.
-
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-
-# For more details on how to configure your build environment visit
-# http://www.gradle.org/docs/current/userguide/build_environment.html
-
-# Specifies the JVM arguments used for the daemon process.
-# The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx1536m
-
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
-
-# AndroidX package structure to make it clearer which packages are bundled with the
-# Android operating system, and which are packaged with your app's APK
-# https://developer.android.com/topic/libraries/support-library/androidx-rn
-android.useAndroidX=true
-# Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true

package/android/gradlew

@@ -1,188 +0,0 @@
-#!/usr/bin/env sh
-
-#
-# Copyright 2015 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
-#
-#      https://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.
-#
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
-    echo "$*"
-}
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
-exec "$JAVACMD" "$@"