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

adding iOS XCFramework support #10

Merged
Merged
Show file tree
Hide file tree
Changes from all 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: AEP-Assurance/

# Output
- uses: actions/upload-artifact@v1
- uses: actions/upload-artifact@v2
with:
name: AEPAssurancePackage
path: bin
path: bin
8 changes: 0 additions & 8 deletions AEP-Assurance/Assets/Editor.meta

This file was deleted.

44 changes: 0 additions & 44 deletions AEP-Assurance/Assets/Editor/BuildPostProcessor.cs

This file was deleted.

11 changes: 0 additions & 11 deletions AEP-Assurance/Assets/Editor/BuildPostProcessor.cs.meta

This file was deleted.

Binary file not shown.
33 changes: 0 additions & 33 deletions AEP-Assurance/Assets/Plugins/iOS/libAEPAssurance_iOS.a.meta

This file was deleted.

2 changes: 0 additions & 2 deletions AEP-Assurance/ProjectSettings/ProjectVersion.txt

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Unity Plug-in v: 0.0.1
Unity Plug-in v: 1.0.0
AEPAssurance.cs

Copyright 2020 Adobe. All rights reserved.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ accordance with the terms of the Adobe license agreement accompanying
public class AssuranceScene : MonoBehaviour
{
private const string LOG_TAG = "AssuranceScene:: ";
private const string APP_ID = "";
//UI Fields
public Text resultText; //For Testing purpose.
public Button btnAssuranceStartSession;
Expand All @@ -28,7 +29,7 @@ public class AssuranceScene : MonoBehaviour
public static void HandleStartAdobeCallback()
{
print(LOG_TAG + "HandleStartAdobeCallback");
ACPCore.ConfigureWithAppID("94f571f308d5/00fc543a60e1/launch-c861fab912f7-development");
ACPCore.ConfigureWithAppID(APP_ID);
}

// Start is called before the first frame update
Expand All @@ -53,7 +54,7 @@ void Start()
//Assurance plugin methods.
public void startAssuranceSession()
{
const string url = "griffon://?adb_validation_sessionid=6b55294e-32d4-49e8-9279-e3fe12a9d309";
const string url = "";
AEPAssurance.StartSession(url);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public IEnumerator VerifyAssuranceVersion()
var button = gameObj.GetComponent<Button>();
button.onClick.Invoke();
yield return new WaitForSeconds(1f);
Assert.AreEqual("Assurance Version: "+ (Application.platform == RuntimePlatform.Android ? "1.1.7" : "1.1.0"), getActualResult());
Assert.AreEqual("Assurance Version: "+ (Application.platform == RuntimePlatform.Android ? "1.0.0" : "1.1.3"), getActualResult());
}

private string getActualResult() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{
"dependencies": {
"com.unity.collab-proxy": "1.2.16",
"com.unity.ide.rider": "1.1.4",
"com.unity.ide.vscode": "1.1.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.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.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
Expand Down
Loading