Skip to content

Commit b3472f8

Browse files
nattb8nattb8
authored
Merge pull request #337 from immutable/test/ios-builder
[DX-3413] test: ios builder
2 parents 9a7b0a5 + 33085e0 commit b3472f8

File tree

6 files changed

+50
-27
lines changed

6 files changed

+50
-27
lines changed

‎sample/Assets/Editor/MacBuilder.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ private static BuildPlayerOptions CreateBuildPlayerOptions(string buildPath, Bui
7171
"Assets/Scenes/ZkEvmGetBalance.unity",
7272
"Assets/Scenes/ZkEvmGetTransactionReceipt.unity",
7373
"Assets/Scenes/ZkEvmSendTransaction.unity",
74-
"Assets/Scenes/ImxNftTransfer.unity"
74+
"Assets/Scenes/ImxNftTransfer.unity",
75+
"Assets/Scenes/ZkEVMSignTypedData.unity"
7576
},
7677
locationPathName = buildPath,
7778
target = BuildTarget.StandaloneOSX,

‎sample/Assets/Editor/AndroidBuilder.cs renamed to ‎sample/Assets/Editor/MobileBuilder.cs

Lines changed: 32 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,40 +6,44 @@
66
using System;
77
using System.IO;
88

9-
public class AndroidBuilder
9+
public class MobileBuilder
1010
{
11-
private const string DefaultBuildPath = "Builds/Android/SampleApp.apk";
11+
private const string DefaultAndroidBuildPath = "Builds/Android/SampleApp.apk";
12+
private const string DefaultiOSBuildPath = "Builds/iOS";
1213

1314
static void Build()
1415
{
15-
BuildPlayer(DefaultBuildPath, BuildOptions.Development);
16+
var platform = GetPlatformFromArgs();
17+
string defaultBuildPath = platform == BuildTarget.Android ? DefaultAndroidBuildPath : DefaultiOSBuildPath;
18+
BuildPlayer(defaultBuildPath, BuildOptions.Development, platform);
1619
}
1720

1821
static void BuildForAltTester()
1922
{
20-
BuildPlayer(DefaultBuildPath, BuildOptions.Development | BuildOptions.IncludeTestAssemblies, true);
23+
var platform = GetPlatformFromArgs();
24+
string defaultBuildPath = platform == BuildTarget.Android ? DefaultAndroidBuildPath : DefaultiOSBuildPath;
25+
BuildPlayer(defaultBuildPath, BuildOptions.Development | BuildOptions.IncludeTestAssemblies, platform, true);
2126
}
2227

23-
24-
private static void BuildPlayer(string defaultBuildPath, BuildOptions buildOptions, bool setupForAltTester = false)
28+
private static void BuildPlayer(string defaultBuildPath, BuildOptions buildOptions, BuildTarget platform, bool setupForAltTester = false)
2529
{
2630
try
2731
{
2832
string buildPath = GetBuildPathFromArgs(defaultBuildPath);
2933

30-
BuildPlayerOptions buildPlayerOptions = CreateBuildPlayerOptions(buildPath, buildOptions);
34+
BuildPlayerOptions buildPlayerOptions = CreateBuildPlayerOptions(buildPath, buildOptions, platform);
3135

3236
if (setupForAltTester)
3337
{
34-
SetupAltTester(buildPlayerOptions);
38+
SetupAltTester(buildPlayerOptions, platform);
3539
}
3640

3741
var results = BuildPipeline.BuildPlayer(buildPlayerOptions);
3842

3943
if (setupForAltTester)
4044
{
4145
// Clean up AltTester settings after build
42-
AltBuilder.RemoveAltTesterFromScriptingDefineSymbols(BuildTargetGroup.Android);
46+
AltBuilder.RemoveAltTesterFromScriptingDefineSymbols(platform == BuildTarget.Android ? BuildTargetGroup.Android : BuildTargetGroup.iOS);
4347
RemoveAltFromScene(buildPlayerOptions.scenes[0]);
4448
}
4549
}
@@ -62,7 +66,20 @@ private static string GetBuildPathFromArgs(string defaultBuildPath)
6266
return defaultBuildPath;
6367
}
6468

65-
private static BuildPlayerOptions CreateBuildPlayerOptions(string buildPath, BuildOptions buildOptions)
69+
private static BuildTarget GetPlatformFromArgs()
70+
{
71+
string[] args = Environment.GetCommandLineArgs();
72+
for (int i = 0; i < args.Length; i++)
73+
{
74+
if (args[i] == "--platform" && i + 1 < args.Length)
75+
{
76+
return args[i + 1].Equals("iOS", StringComparison.OrdinalIgnoreCase) ? BuildTarget.iOS : BuildTarget.Android;
77+
}
78+
}
79+
return BuildTarget.Android; // Default to Android if no platform is specified
80+
}
81+
82+
private static BuildPlayerOptions CreateBuildPlayerOptions(string buildPath, BuildOptions buildOptions, BuildTarget platform)
6683
{
6784
return new BuildPlayerOptions
6885
{
@@ -74,17 +91,18 @@ private static BuildPlayerOptions CreateBuildPlayerOptions(string buildPath, Bui
7491
"Assets/Scenes/ZkEvmGetBalance.unity",
7592
"Assets/Scenes/ZkEvmGetTransactionReceipt.unity",
7693
"Assets/Scenes/ZkEvmSendTransaction.unity",
77-
"Assets/Scenes/ImxNftTransfer.unity"
94+
"Assets/Scenes/ImxNftTransfer.unity",
95+
"Assets/Scenes/ZkEVMSignTypedData.unity"
7896
},
7997
locationPathName = buildPath,
80-
target = BuildTarget.Android,
98+
target = platform,
8199
options = buildOptions
82100
};
83101
}
84102

85-
private static void SetupAltTester(BuildPlayerOptions buildPlayerOptions)
103+
private static void SetupAltTester(BuildPlayerOptions buildPlayerOptions, BuildTarget platform)
86104
{
87-
AltBuilder.AddAltTesterInScriptingDefineSymbolsGroup(BuildTargetGroup.Android);
105+
AltBuilder.AddAltTesterInScriptingDefineSymbolsGroup(platform == BuildTarget.Android ? BuildTargetGroup.Android : BuildTargetGroup.iOS);
88106
AltBuilder.CreateJsonFileForInputMappingOfAxis();
89107

90108
var instrumentationSettings = new AltInstrumentationSettings();

‎sample/Assets/Editor/AndroidBuilder.cs.meta renamed to ‎sample/Assets/Editor/MobileBuilder.cs.meta

File renamed without changes.

‎sample/Assets/Editor/WindowsBuilder.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ private static BuildPlayerOptions CreateBuildPlayerOptions(string buildPath, Bui
7171
"Assets/Scenes/ZkEvmGetBalance.unity",
7272
"Assets/Scenes/ZkEvmGetTransactionReceipt.unity",
7373
"Assets/Scenes/ZkEvmSendTransaction.unity",
74-
"Assets/Scenes/ImxNftTransfer.unity"
74+
"Assets/Scenes/ImxNftTransfer.unity",
75+
"Assets/Scenes/ZkEVMSignTypedData.unity"
7576
},
7677
locationPathName = buildPath,
7778
target = BuildTarget.StandaloneWindows64,

‎sample/Assets/Scenes/SelectAuthMethod.unity

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,8 @@ MonoBehaviour:
206206
m_TargetGraphic: {fileID: 416242725}
207207
m_HandleRect: {fileID: 416242724}
208208
m_Direction: 0
209-
m_Value: 1
210-
m_Size: 1
209+
m_Value: 0
210+
m_Size: 0.9999999
211211
m_NumberOfSteps: 0
212212
m_OnValueChanged:
213213
m_PersistentCalls:
@@ -1323,7 +1323,7 @@ MonoBehaviour:
13231323
m_TargetGraphic: {fileID: 167431872}
13241324
m_HandleRect: {fileID: 167431871}
13251325
m_Direction: 2
1326-
m_Value: 1
1326+
m_Value: 0
13271327
m_Size: 1
13281328
m_NumberOfSteps: 0
13291329
m_OnValueChanged:
@@ -1673,8 +1673,8 @@ RectTransform:
16731673
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
16741674
m_AnchorMin: {x: 0, y: 0}
16751675
m_AnchorMax: {x: 0, y: 0}
1676-
m_AnchoredPosition: {x: 905.59955, y: 0}
1677-
m_SizeDelta: {x: 1771.1991, y: 0}
1676+
m_AnchoredPosition: {x: 1259.3727, y: 0}
1677+
m_SizeDelta: {x: 2478.7454, y: 0}
16781678
m_Pivot: {x: 0.5, y: 0.5}
16791679
--- !u!114 &1661390145
16801680
MonoBehaviour:
@@ -1768,8 +1768,8 @@ RectTransform:
17681768
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
17691769
m_AnchorMin: {x: 0, y: 0}
17701770
m_AnchorMax: {x: 0, y: 0}
1771-
m_AnchoredPosition: {x: 905.59955, y: 0}
1772-
m_SizeDelta: {x: 1771.1991, y: 0}
1771+
m_AnchoredPosition: {x: 1259.3727, y: 0}
1772+
m_SizeDelta: {x: 2478.7454, y: 0}
17731773
m_Pivot: {x: 0.5, y: 0.5}
17741774
--- !u!114 &1688502349
17751775
MonoBehaviour:

‎sample/ProjectSettings/ProjectSettings.asset

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,13 +155,15 @@ PlayerSettings:
155155
androidSupportedAspectRatio: 1
156156
androidMaxAspectRatio: 2.1
157157
applicationIdentifier:
158+
Android: com.immutable.ImmutableSample
158159
Standalone: com.immutable.unitysample
160+
iPhone: com.immutable.Immutable-Sample
159161
buildNumber:
160162
Standalone: 0
161163
VisionOS: 0
162164
iPhone: 0
163165
tvOS: 0
164-
overrideDefaultApplicationIdentifier: 1
166+
overrideDefaultApplicationIdentifier: 0
165167
AndroidBundleVersionCode: 1
166168
AndroidMinSdkVersion: 26
167169
AndroidTargetSdkVersion: 33
@@ -232,7 +234,7 @@ PlayerSettings:
232234
tvOSManualSigningProvisioningProfileID:
233235
iOSManualSigningProvisioningProfileType: 0
234236
tvOSManualSigningProvisioningProfileType: 0
235-
appleEnableAutomaticSigning: 0
237+
appleEnableAutomaticSigning: 1
236238
iOSRequireARKit: 0
237239
iOSAutomaticallyDetectAndAddCapabilities: 1
238240
appleEnableProMotion: 0
@@ -529,7 +531,7 @@ PlayerSettings:
529531
logObjCUncaughtExceptions: 1
530532
enableCrashReportAPI: 0
531533
cameraUsageDescription:
532-
locationUsageDescription:
534+
locationUsageDescription: Not used
533535
microphoneUsageDescription:
534536
bluetoothUsageDescription:
535537
switchNMETAOverride:
@@ -774,6 +776,7 @@ PlayerSettings:
774776
scriptingDefineSymbols:
775777
Android: VUPLEX_STANDALONE
776778
Standalone: VUPLEX_STANDALONE
779+
iPhone:
777780
additionalCompilerArguments:
778781
Standalone:
779782
- -nullable+
@@ -801,7 +804,7 @@ PlayerSettings:
801804
allowUnsafeCode: 0
802805
useDeterministicCompilation: 1
803806
enableRoslynAnalyzers: 1
804-
selectedPlatform: 2
807+
selectedPlatform: 3
805808
additionalIl2CppArgs:
806809
scriptingRuntimeVersion: 1
807810
gcIncremental: 1

0 commit comments

Comments
 (0)