Skip to content

Commit f4f07e8

Browse files
authored
Update extender's client with 'source code as archive' functionality. (#11055)
* Update extender's client with 'source code as archive' functionality. Removed async flag for build method * Update extender's client with zip upload fixes * Fix build method call
1 parent b64ea7a commit f4f07e8

File tree

4 files changed

+3
-5
lines changed

4 files changed

+3
-5
lines changed

com.dynamo.cr/com.dynamo.cr.bob/src/com/dynamo/bob/bundle/BundleHelper.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -796,8 +796,7 @@ public static File buildEngineRemote(Project project, ExtenderClient extender, S
796796
checkForDuplicates(allSource);
797797

798798
try {
799-
boolean async = true;
800-
extender.build(platform, sdkVersion, allSource, zipFile, logFile, async);
799+
extender.build(platform, sdkVersion, allSource, zipFile, logFile);
801800
} catch (ExtenderClientException e) {
802801
if (e.getCause() instanceof ConnectException) {
803802
throw (ConnectException)e.getCause();
Binary file not shown.
Binary file not shown.

editor/src/clj/editor/engine/native_extensions.clj

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -270,8 +270,7 @@
270270
:extender-platform extender-platform}
271271
(let [extender-client (ExtenderClient. url cache-directory)
272272
destination-file (fs/create-temp-file! (str "build_" sdk-version) ".zip")
273-
log-file (fs/create-temp-file! (str "build_" sdk-version) ".txt")
274-
async true]
273+
log-file (fs/create-temp-file! (str "build_" sdk-version) ".txt")]
275274
(try
276275
(when-let [^String auth (or
277276
(and (not (string/blank? username))
@@ -281,7 +280,7 @@
281280
(.setHeader extender-client "Authorization" (str "Basic " (.encodeToString (Base64/getEncoder) (.getBytes auth StandardCharsets/UTF_8)))))
282281
(when (pos? (count headers))
283282
(.setHeaders extender-client headers))
284-
(.build extender-client extender-platform sdk-version extender-resources destination-file log-file async)
283+
(.build extender-client extender-platform sdk-version extender-resources destination-file log-file)
285284
{:id {:type :custom :version cache-key}
286285
:engine-archive destination-file
287286
:extender-platform extender-platform}

0 commit comments

Comments
 (0)