Skip to content
This repository has been archived by the owner on Aug 7, 2023. It is now read-only.

Adding iOS XCFramework support #27

Merged
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,21 @@ jobs:
lfs: true

# Cache
- uses: actions/cache@v1.1.0
- uses: actions/cache@v2
with:
path: cache
key: cache

# Build
- name: Build project
uses: webbertakken/unity-builder@v0.10
uses: game-ci/unity-builder@v2
with:
unityVersion: 2019.3.11f1
unityVersion: auto
targetPlatform: iOS
projectPath: ACPCore/

# Output
- uses: actions/upload-artifact@v1
- uses: actions/upload-artifact@v2
with:
name: ACPCorePackage
path: bin
path: bin
2 changes: 1 addition & 1 deletion ACPCore/Assets/Demo/Tests/NewTests/TestSuite.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public IEnumerator Test_ExtensionVersion()
if (Application.platform == RuntimePlatform.Android) {
return AssertEqualResult("CoreExtensionVersion", "coreVersion - 1.5.3-UN identityVersion - 1.2.0 lifecycleVersion - 1.0.4 signalVersion - 1.0.2 ");
} else if (Application.platform == RuntimePlatform.IPhonePlayer) {
return AssertEqualResult("CoreExtensionVersion", "coreVersion - 2.6.0- identityVersion - 2.2.1 lifecycleVersion - 2.0.4 signalVersion - 2.0.4 ");
return AssertEqualResult("CoreExtensionVersion", "coreVersion - 2.9.4-U identityVersion - 2.5.1 lifecycleVersion - 2.2.1 signalVersion - 2.2.0 ");
} else {
return null;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ accordance with the terms of the Adobe license agreement accompanying
*/

using System.IO;
using UnityEngine;
using UnityEditor;
using UnityEditor.Callbacks;
using UnityEditor.iOS.Xcode;
Expand Down Expand Up @@ -39,6 +38,12 @@ public static void OnPostProcessBuild(BuildTarget target, string path)
static void AddFrameworks(PBXProject project, string targetGUID)
{
project.AddFrameworkToProject(targetGUID, "WebKit.framework", false);
project.AddFrameworkToProject(targetGUID, "SystemConfiguration.framework", false);
project.AddFrameworkToProject(targetGUID, "UserNotifications.framework", false);
project.AddFrameworkToProject(targetGUID, "UIKit.framework", false);
project.AddFrameworkToProject(targetGUID, "libsqlite3.tbd", false);
project.AddFrameworkToProject(targetGUID, "libz.tbd", false);
project.AddFrameworkToProject(targetGUID, "libc++.tbd", false);
project.AddBuildProperty(targetGUID, "OTHER_LDFLAGS", "-ObjC");
}
}
Binary file removed ACPCore/Assets/Plugins/iOS/libACPCore_iOS.a
Binary file not shown.
33 changes: 0 additions & 33 deletions ACPCore/Assets/Plugins/iOS/libACPCore_iOS.a.meta

This file was deleted.

Binary file removed ACPCore/Assets/Plugins/iOS/libACPIdentity_iOS.a
Binary file not shown.
33 changes: 0 additions & 33 deletions ACPCore/Assets/Plugins/iOS/libACPIdentity_iOS.a.meta

This file was deleted.

Binary file removed ACPCore/Assets/Plugins/iOS/libACPLifecycle_iOS.a
Binary file not shown.
33 changes: 0 additions & 33 deletions ACPCore/Assets/Plugins/iOS/libACPLifecycle_iOS.a.meta

This file was deleted.

Binary file removed ACPCore/Assets/Plugins/iOS/libACPSignal_iOS.a
Binary file not shown.
33 changes: 0 additions & 33 deletions ACPCore/Assets/Plugins/iOS/libACPSignal_iOS.a.meta

This file was deleted.

17 changes: 9 additions & 8 deletions ACPCore/Packages/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,16 @@
"dependencies": {
"com.unity.2d.sprite": "1.0.0",
"com.unity.2d.tilemap": "1.0.0",
"com.unity.collab-proxy": "1.2.16",
"com.unity.ide.rider": "1.1.4",
"com.unity.ide.vscode": "1.1.4",
"com.unity.multiplayer-hlapi": "1.0.4",
"com.unity.test-framework": "1.1.13",
"com.unity.textmeshpro": "2.0.1",
"com.unity.timeline": "1.2.14",
"com.unity.collab-proxy": "1.14.4",
"com.unity.ide.rider": "1.2.1",
"com.unity.ide.visualstudio": "2.0.12",
"com.unity.ide.vscode": "1.2.4",
"com.unity.multiplayer-hlapi": "1.0.8",
"com.unity.test-framework": "1.1.29",
"com.unity.textmeshpro": "2.1.4",
"com.unity.timeline": "1.2.18",
"com.unity.ugui": "1.0.0",
"com.unity.xr.legacyinputhelpers": "1.3.11",
"com.unity.xr.legacyinputhelpers": "2.1.8",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
"com.unity.modules.animation": "1.0.0",
Expand Down
Loading