diff --git a/Project/Sources/Classes/EDITOR.4dm b/Project/Sources/Classes/EDITOR.4dm index ded10cba..570aa9ed 100644 --- a/Project/Sources/Classes/EDITOR.4dm +++ b/Project/Sources/Classes/EDITOR.4dm @@ -910,13 +910,14 @@ Function postMessage($message : Object) This:C1470.callMe(Formula:C1597(DO_MESSAGE).source; $message) //=== === === === === === === === === === === === === === === === === === === === === -Function checkDevTools() +Function checkDevTools($force : Boolean) This:C1470.addTask("checkDevTools") This:C1470.callWorker(Formula:C1597(editor_CHECK_INSTALLATION).source; New object:C1471(\ "caller"; This:C1470.window; \ "method"; Formula:C1597(editor_CALLBACK).source; \ "message"; "checkDevTools"; \ + "force"; Bool:C1537($force); \ "xCode"; This:C1470.xCode; \ "studio"; This:C1470.studio; \ "android"; PROJECT.$android; \ diff --git a/Project/Sources/Classes/Xcode.4dm b/Project/Sources/Classes/Xcode.4dm index df6aed50..e8810e5d 100644 --- a/Project/Sources/Classes/Xcode.4dm +++ b/Project/Sources/Classes/Xcode.4dm @@ -32,7 +32,7 @@ Class constructor($useDefaultPath : Boolean) End if //==================================================================== -Function getRequirements() +Function getRequirements($force : Boolean) var $ETag : Text var $run : Boolean @@ -61,7 +61,7 @@ Function getRequirements() $run:=True:C214 End if - If ($run) + If ($run || Bool:C1537($force)) $http:=cs:C1710.http.new("https://4d-go-mobile.github.io/sdk/xcode.json").setResponseType(Is a document:K24:1; $requirement) diff --git a/Project/Sources/Methods/RIBBON_SIMULATOR.4dm b/Project/Sources/Methods/RIBBON_SIMULATOR.4dm index 62be9091..5b02a42d 100644 --- a/Project/Sources/Methods/RIBBON_SIMULATOR.4dm +++ b/Project/Sources/Methods/RIBBON_SIMULATOR.4dm @@ -200,7 +200,7 @@ Case of End if // Launch checking the development environment - UI.checkDevTools() + UI.checkDevTools(True:C214) //______________________________________________________ : ($menu.choice="XcodeDeviceManager") diff --git a/Project/Sources/Methods/Xcode_CheckInstall.4dm b/Project/Sources/Methods/Xcode_CheckInstall.4dm index 898e0265..58424b66 100644 --- a/Project/Sources/Methods/Xcode_CheckInstall.4dm +++ b/Project/Sources/Methods/Xcode_CheckInstall.4dm @@ -64,7 +64,7 @@ $Xcode:=cs:C1710.Xcode.new(True:C214) If ($Xcode.success) // *CHECK IF MORE THAN ONE INSTANCE OF XCODE IS INSTALLED TO USE THE BEST ONE... - $Xcode.getRequirements() + $Xcode.getRequirements(Bool:C1537($in.force)) $requestedVersion:=$Xcode.requirement // *** POUR LE TEST *** diff --git a/Resources/requirements.json b/Resources/requirements.json index 7f371cc3..bd2141c5 100644 --- a/Resources/requirements.json +++ b/Resources/requirements.json @@ -58,25 +58,10 @@ "ios": "16.0", "swift": "5.7" }, - "2000": { - "xcode": "^14.3.1", - "ios": "16.0", - "swift": "5.8.1" - }, - "2001": { - "xcode": "^15.0.0", - "ios": "16.0", - "swift": "5.9.0" - }, - "2020": { - "xcode": "^15.0.0", - "ios": "16.0", - "swift": "5.9.0" - }, "": { - "xcode": "^15.2.0", - "ios": "16.0", - "swift": "5.9.2" + "xcode": "~15.3.0", + "ios": "16.0", + "swift": "5.10.0" }, - "Etag": "W/\"65a7a272-497\"" + "Etag": "W/\"65e84a4e-3a5\"" } \ No newline at end of file