Maintenance (#637)

coronalabs · Oct 15, 2023 · 276067a · 276067a
1 parent c201c8e
commit 276067a
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 53 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -834,7 +834,7 @@ jobs:
       - release
       - source-code
     runs-on: ubuntu-20.04
-    if: always() && (!contains(github.ref, 'refs/tags/') || github.repository == 'coronalabs/corona')
+    if: (success() || failure()) && !cancelled() && (!contains(github.ref, 'refs/tags/') || github.repository == 'coronalabs/corona')
     steps:
       - uses: technote-space/workflow-conclusion-action@v1
       - uses: actions/checkout@v3

diff --git a/platform/mac/CoronaBuilder.xcodeproj/project.pbxproj b/platform/mac/CoronaBuilder.xcodeproj/project.pbxproj
@@ -104,8 +104,6 @@
 		F53C329F2404E30900BC2BED /* CoronaBuilderPluginCollector.lua in Sources */ = {isa = PBXBuildFile; fileRef = F53C328E2404E2C000BC2BED /* CoronaBuilderPluginCollector.lua */; };
 		F547C7F61ED28A2700C4ED92 /* Rtt_DownloadPluginsMain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F547C7F41ED28A2700C4ED92 /* Rtt_DownloadPluginsMain.cpp */; };
 		F547C7F71ED28BA600C4ED92 /* BuilderPluginDownloader.lua in Sources */ = {isa = PBXBuildFile; fileRef = F547C7ED1ED289EA00C4ED92 /* BuilderPluginDownloader.lua */; };
-		F583ABFE2ADAF5C2002799CB /* network.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F583ABF22ADAF5A7002799CB /* network.dylib */; };
-		F583ABFF2ADAF5D9002799CB /* network.dylib in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = F583ABF22ADAF5A7002799CB /* network.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
 		F58CA29C245658C5002191EA /* Rtt_HTTPClientCommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F58CA28C245658C5002191EA /* Rtt_HTTPClientCommon.cpp */; };
 		F58CA29E245658E3002191EA /* Rtt_HTTPClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = F58CA29D245658E3002191EA /* Rtt_HTTPClient.mm */; };
 		F5BEA4B823FFE98200206A6A /* CoronaOfflineiOSPackager.lua in Sources */ = {isa = PBXBuildFile; fileRef = F5BEA4A723FFE97300206A6A /* CoronaOfflineiOSPackager.lua */; };
@@ -301,16 +299,9 @@
 			remoteGlobalIDString = C2D927251ACA098800B7F9AC;
 			remoteInfo = CoronaShell;
 		};
-		F583ABEB2ADAF5A7002799CB /* PBXContainerItemProxy */ = {
+		F5567DDA2ADC7847008CD550 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = F583ABE82ADAF5A7002799CB /* NetworkPlugin.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = A49186331641DDB800A39286;
-			remoteInfo = network;
-		};
-		F583ABF12ADAF5A7002799CB /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = F583ABE82ADAF5A7002799CB /* NetworkPlugin.xcodeproj */;
+			containerPortal = F5567DBC2ADC76CF008CD550 /* NetworkPlugin.xcodeproj */;
 			proxyType = 2;
 			remoteGlobalIDString = A49186401641DDB800A39286;
 			remoteInfo = network;
@@ -331,7 +322,6 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				F583ABFF2ADAF5D9002799CB /* network.dylib in Copy Frameworks */,
 			);
 			name = "Copy Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -541,8 +531,9 @@
 		F547C7ED1ED289EA00C4ED92 /* BuilderPluginDownloader.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = BuilderPluginDownloader.lua; path = ../../tools/CoronaBuilder/BuilderPluginDownloader.lua; sourceTree = "<group>"; };
 		F547C7F41ED28A2700C4ED92 /* Rtt_DownloadPluginsMain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Rtt_DownloadPluginsMain.cpp; path = ../../tools/CoronaBuilder/Rtt_DownloadPluginsMain.cpp; sourceTree = "<group>"; };
 		F547C7F51ED28A2700C4ED92 /* Rtt_DownloadPluginsMain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Rtt_DownloadPluginsMain.h; path = ../../tools/CoronaBuilder/Rtt_DownloadPluginsMain.h; sourceTree = "<group>"; };
+		F5567DAB2ADC76C2008CD550 /* network.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; path = network.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
+		F5567DBC2ADC76CF008CD550 /* NetworkPlugin.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = NetworkPlugin.xcodeproj; path = ../../plugins/network/mac/NetworkPlugin.xcodeproj; sourceTree = SOURCE_ROOT; };
 		F56569EE24565C320059F1A9 /* Rtt_HTTPClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Rtt_HTTPClient.h; path = ../../librtt/Rtt_HTTPClient.h; sourceTree = "<group>"; };
-		F583ABE82ADAF5A7002799CB /* NetworkPlugin.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = NetworkPlugin.xcodeproj; path = /Users/vlad/Projects/corona/plugins/network/mac/NetworkPlugin.xcodeproj; sourceTree = "<absolute>"; };
 		F58CA28C245658C5002191EA /* Rtt_HTTPClientCommon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Rtt_HTTPClientCommon.cpp; path = ../../librtt/Rtt_HTTPClientCommon.cpp; sourceTree = "<group>"; };
 		F58CA29D245658E3002191EA /* Rtt_HTTPClient.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Rtt_HTTPClient.mm; sourceTree = "<group>"; };
 		F5BEA4A723FFE97300206A6A /* CoronaOfflineiOSPackager.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CoronaOfflineiOSPackager.lua; path = ../resources/CoronaOfflineiOSPackager.lua; sourceTree = "<group>"; };
@@ -558,7 +549,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				F583ABFE2ADAF5C2002799CB /* network.dylib in Frameworks */,
 				F5FBD1DB206961A4009A9D32 /* libluasocket.a in Frameworks */,
 				C21A81D61AAFC41800128F5E /* liblua-universal.a in Frameworks */,
 				A4A47E3D14D2302800B5111C /* IOKit.framework in Frameworks */,
@@ -868,6 +858,7 @@
 				C2F1BAFD1EF48F2F00D77BD7 /* ratatouille.xcodeproj */,
 				C2F1BAF71EF48EF500D77BD7 /* CoronaShell.xcodeproj */,
 				A4ED11ED14D350C400ECF49E /* lua.xcodeproj */,
+				F5567DBC2ADC76CF008CD550 /* NetworkPlugin.xcodeproj */,
 				A4BABCDC14CF4B7B00696484 /* external */,
 				A4BABC9614CF496700696484 /* librtt */,
 				A4DFE6D914CF438400C2A230 /* shared */,
@@ -883,7 +874,6 @@
 				A4DFE6DA14CF439000C2A230 /* Resources */,
 				A4FCD3EF14CF417C0004E91D /* Frameworks */,
 				A4FCD3ED14CF417C0004E91D /* Products */,
-				F583ABE82ADAF5A7002799CB /* NetworkPlugin.xcodeproj */,
 			);
 			sourceTree = "<group>";
 		};
@@ -898,6 +888,7 @@
 		A4FCD3EF14CF417C0004E91D /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				F5567DAB2ADC76C2008CD550 /* network.dylib */,
 				A4A47E3C14D2302800B5111C /* IOKit.framework */,
 				A4A47E2714D2284300B5111C /* SystemConfiguration.framework */,
 				A4A47E2014D227D000B5111C /* Security.framework */,
@@ -1006,10 +997,10 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
-		F583ABE92ADAF5A7002799CB /* Products */ = {
+		F5567DD42ADC7847008CD550 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				F583ABF22ADAF5A7002799CB /* network.dylib */,
+				F5567DDB2ADC7847008CD550 /* network.dylib */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -1030,7 +1021,6 @@
 				A4ED11BE14D34A4900ECF49E /* PBXBuildRule */,
 			);
 			dependencies = (
-				F583ABEC2ADAF5A7002799CB /* PBXTargetDependency */,
 				F5FBD1DD206961A9009A9D32 /* PBXTargetDependency */,
 				C2342E501AC1D2220091FE20 /* PBXTargetDependency */,
 				A4ED120A14D350DA00ECF49E /* PBXTargetDependency */,
@@ -1076,8 +1066,8 @@
 					ProjectRef = A4ED11ED14D350C400ECF49E /* lua.xcodeproj */;
 				},
 				{
-					ProductGroup = F583ABE92ADAF5A7002799CB /* Products */;
-					ProjectRef = F583ABE82ADAF5A7002799CB /* NetworkPlugin.xcodeproj */;
+					ProductGroup = F5567DD42ADC7847008CD550 /* Products */;
+					ProjectRef = F5567DBC2ADC76CF008CD550 /* NetworkPlugin.xcodeproj */;
 				},
 				{
 					ProductGroup = C2F1BAFE1EF48F2F00D77BD7 /* Products */;
@@ -1225,11 +1215,11 @@
 			remoteRef = C2F1BB281EF48F3000D77BD7 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		F583ABF22ADAF5A7002799CB /* network.dylib */ = {
+		F5567DDB2ADC7847008CD550 /* network.dylib */ = {
 			isa = PBXReferenceProxy;
 			fileType = "compiled.mach-o.dylib";
 			path = network.dylib;
-			remoteRef = F583ABF12ADAF5A7002799CB /* PBXContainerItemProxy */;
+			remoteRef = F5567DDA2ADC7847008CD550 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
 /* End PBXReferenceProxy section */
@@ -1379,11 +1369,6 @@
 			name = CoronaShell;
 			targetProxy = C2F1BB2A1EF48F7200D77BD7 /* PBXContainerItemProxy */;
 		};
-		F583ABEC2ADAF5A7002799CB /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = network;
-			targetProxy = F583ABEB2ADAF5A7002799CB /* PBXContainerItemProxy */;
-		};
 		F5FBD1DD206961A9009A9D32 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = libluasocket;