Skip to content

Commit

Permalink
Merge branch 'anst/build-script'
Browse files Browse the repository at this point in the history
  • Loading branch information
achimmihca committed Jan 21, 2023
2 parents 55916ff + df85461 commit 63047be
Show file tree
Hide file tree
Showing 25 changed files with 482 additions and 244 deletions.
8 changes: 8 additions & 0 deletions UltraStar Play Companion/Assets/Editor.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 23 additions & 0 deletions UltraStar Play Companion/Assets/Editor/Editor.asmdef
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"name": "Editor",
"rootNamespace": "",
"references": [
"playshared",
"playshared.Editor",
"Plugins",
"Common"
],
"includePlatforms": [
"Editor"
],
"excludePlatforms": [],
"allowUnsafeCode": false,
"overrideReferences": true,
"precompiledReferences": [
""
],
"autoReferenced": false,
"defineConstraints": [],
"versionDefines": [],
"noEngineReferences": false
}
7 changes: 7 additions & 0 deletions UltraStar Play Companion/Assets/Editor/Editor.asmdef.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
using UnityEditor;
using UnityEngine;

public static class UltraStarPlayCompanionBuildTools
{
private static readonly string appName = "UltraStar Play Companion";

[MenuItem("Tools/Build/All")]
public static void BuildAll()
{
BuildAndRunSignedAndroidApk();
BuildAndRunSignedAndroidAppBundle();
}

[MenuItem("Tools/Build/Android - Build apk")]
public static void BuildAndroidApk()
{
BuildUtils.PerformCustomBuild(CreateCustomBuildOptions(BuildTarget.Android));
}

[MenuItem("Tools/Build/Android - Build and run apk")]
public static void BuildAndRunAndroidApk()
{
CustomBuildOptions customBuildOptions = CreateCustomBuildOptions(BuildTarget.Android);
customBuildOptions.buildOptions = BuildOptions.AutoRunPlayer;
BuildUtils.PerformCustomBuild(customBuildOptions);
}

[MenuItem("Tools/Build/Android - Build and run signed apk")]
public static void BuildAndRunSignedAndroidApk()
{
CustomBuildOptions customBuildOptions = CreateCustomBuildOptions(BuildTarget.Android);
customBuildOptions.buildOptions = BuildOptions.AutoRunPlayer;
customBuildOptions.configureKeystoreForAndroidBuild = true;
BuildUtils.PerformCustomBuild(customBuildOptions);
}

[MenuItem("Tools/Build/Android - Build and run signed app bundle")]
public static void BuildAndRunSignedAndroidAppBundle()
{
CustomBuildOptions customBuildOptions = CreateCustomBuildOptions(BuildTarget.Android);
customBuildOptions.buildOptions = BuildOptions.AutoRunPlayer;
customBuildOptions.configureKeystoreForAndroidBuild = true;
customBuildOptions.buildAppBundleForGooglePlay = true;
BuildUtils.PerformCustomBuild(customBuildOptions);
}

[MenuItem("Tools/Build/iOS")]
public static void BuildIOS()
{
BuildUtils.PerformCustomBuild(CreateCustomBuildOptions(BuildTarget.iOS));
}

private static CustomBuildOptions CreateCustomBuildOptions(BuildTarget buildTarget)
{
CustomBuildOptions customBuildOptions = new CustomBuildOptions(appName, buildTarget);
customBuildOptions.compressOutputFolderToZipFile = true;
return customBuildOptions;
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions UltraStar Play Companion/Assets/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
release = 0.6.0
build_timestamp = 2208102014
commit_hash = 752d4fdf
release = 0.8.2
build_timestamp = 2301211149
commit_hash = 55916ff3
website_link = https://usplay.net/
15 changes: 3 additions & 12 deletions UltraStar Play Companion/Packages/packages-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"depth": 0,
"source": "git",
"dependencies": {},
"hash": "v1.0.0"
"hash": "9d50e260346432ca05b6508b09e21f530ba3bae0"
},
"com.achimmihca.uniinject": {
"version": "https://github.com/achimmihca/UniInject.git?path=UniInject/Packages/com.achimmihca.uniinject#v5.0.1",
Expand Down Expand Up @@ -55,7 +55,7 @@
"url": "https://packages.unity.com"
},
"com.unity.ext.nunit": {
"version": "2.0.3",
"version": "1.0.6",
"depth": 1,
"source": "registry",
"dependencies": {},
Expand Down Expand Up @@ -103,7 +103,7 @@
"url": "https://packages.unity.com"
},
"com.unity.services.core": {
"version": "1.5.2",
"version": "1.7.0",
"depth": 1,
"source": "registry",
"dependencies": {
Expand Down Expand Up @@ -353,15 +353,6 @@
"source": "builtin",
"dependencies": {}
},
"com.unity.modules.unityanalytics": {
"version": "1.0.0",
"depth": 0,
"source": "builtin",
"dependencies": {
"com.unity.modules.unitywebrequest": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0"
}
},
"com.unity.modules.unitywebrequest": {
"version": "1.0.0",
"depth": 0,
Expand Down
24 changes: 9 additions & 15 deletions UltraStar Play Companion/ProjectSettings/ProjectSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
--- !u!129 &1
PlayerSettings:
m_ObjectHideFlags: 0
serializedVersion: 26
serializedVersion: 25
productGUID: d98b7e9ffc2b92b418f8090cf1d3817d
AndroidProfiler: 0
AndroidFilterTouchesWhenObscured: 0
Expand Down Expand Up @@ -52,7 +52,6 @@ PlayerSettings:
m_MTRendering: 1
mipStripping: 0
numberOfMipsStripped: 0
numberOfMipsStrippedPerMipmapLimitGroup: {}
m_StackTraceTypes: 010000000100000001000000010000000100000001000000
iosShowActivityIndicatorOnLoading: -1
androidShowActivityIndicatorOnLoading: -1
Expand Down Expand Up @@ -132,13 +131,8 @@ PlayerSettings:
vulkanEnablePreTransform: 0
vulkanEnableLateAcquireNextImage: 0
vulkanEnableCommandBufferRecycling: 1
m_SupportedAspectRatios:
4:3: 1
5:4: 1
16:10: 1
16:9: 1
Others: 1
bundleVersion: 0.8.0
loadStoreDebugModeEnabled: 0
bundleVersion: 0.8.2
preloadedAssets:
- {fileID: 0}
- {fileID: 0}
Expand Down Expand Up @@ -259,20 +253,20 @@ PlayerSettings:
useCustomBaseGradleTemplate: 0
useCustomGradlePropertiesTemplate: 0
useCustomProguardFile: 0
AndroidTargetArchitectures: 1
AndroidTargetArchitectures: 3
AndroidTargetDevices: 0
AndroidSplashScreenScale: 0
androidSplashScreen: {fileID: 0}
AndroidKeystoreName:
AndroidKeyaliasName:
AndroidKeystoreName: F:/Dev/tmp/UltraStarPlay.keystore
AndroidKeyaliasName: ultrastarplay-upload-key
AndroidEnableArmv9SecurityFeatures: 0
AndroidBuildApkPerCpuArchitecture: 0
AndroidTVCompatibility: 0
AndroidIsGame: 1
AndroidEnableTango: 0
androidEnableBanner: 1
androidUseLowAccuracyLocation: 0
androidUseCustomKeystore: 0
androidUseCustomKeystore: 1
m_AndroidBanners:
- width: 320
height: 180
Expand Down Expand Up @@ -804,15 +798,15 @@ PlayerSettings:
additionalCompilerArguments: {}
platformArchitecture: {}
scriptingBackend:
Android: 0
Android: 1
il2cppCompilerConfiguration: {}
il2cppCodeGeneration: {}
managedStrippingLevel: {}
incrementalIl2cppBuild: {}
suppressCommonWarnings: 1
allowUnsafeCode: 0
useDeterministicCompilation: 1
selectedPlatform: 1
selectedPlatform: 2
additionalIl2CppArgs:
scriptingRuntimeVersion: 1
gcIncremental: 1
Expand Down
4 changes: 2 additions & 2 deletions UltraStar Play Companion/ProjectSettings/ProjectVersion.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
m_EditorVersion: 2023.1.0a18
m_EditorVersionWithRevision: 2023.1.0a18 (14fa785aa82f)
m_EditorVersion: 2022.2.2f1
m_EditorVersionWithRevision: 2022.2.2f1 (c93c5d3acf5b)
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@

public class UltraStarPlayHttpServer : HttpServer, INeedInjection
{
[Inject]
private Settings settings;

protected override void Awake()
{
if (!Application.isPlaying)
Expand All @@ -34,8 +31,8 @@ private void Start()
return;
}

host = !settings.OwnHost.IsNullOrEmpty()
? settings.OwnHost
host = !SettingsManager.Instance.Settings.OwnHost.IsNullOrEmpty()
? SettingsManager.Instance.Settings.OwnHost
: IpAddressUtils.GetIpAddress(AddressFamily.IPv4, NetworkInterfaceType.Wireless80211);

NoEndpointFoundCallback = SendNoEndpointFound;
Expand Down
31 changes: 31 additions & 0 deletions UltraStar Play/Assets/Editor/Editor.asmdef
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"name": "Editor",
"rootNamespace": "",
"references": [
"Serilog",
"UniRx",
"com.achimmihca.uniinject",
"com.achimmihca.protrans",
"com.achimmihca.primeinputactions",
"com.achimmihca.simplehttpserverforunity",
"com.achimmihca.scenechangeanimations",
"Unity.InputSystem",
"playshared",
"playshared.Editor",
"Plugins",
"Common"
],
"includePlatforms": [
"Editor"
],
"excludePlatforms": [],
"allowUnsafeCode": false,
"overrideReferences": true,
"precompiledReferences": [
""
],
"autoReferenced": false,
"defineConstraints": [],
"versionDefines": [],
"noEngineReferences": false
}
7 changes: 7 additions & 0 deletions UltraStar Play/Assets/Editor/Editor.asmdef.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

82 changes: 82 additions & 0 deletions UltraStar Play/Assets/Editor/UltraStarPlayBuildTools.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
using UnityEditor;
using UnityEngine;

public static class UltraStarPlayBuildTools
{
private static readonly string appName = "UltraStar Play";

[MenuItem("Tools/Build/All")]
public static void BuildAll()
{
BuildWindows64();
BuildLinux64();
BuildMacOS();;
BuildAndRunAndroidApk();
BuildAndRunSignedAndroidAppBundle();
BuildIOS();
}

[MenuItem("Tools/Build/Windows64")]
public static void BuildWindows64()
{
BuildUtils.PerformCustomBuild(CreateCustomBuildOptions(BuildTarget.StandaloneWindows64));
}

[MenuItem("Tools/Build/Linux64")]
public static void BuildLinux64()
{
BuildUtils.PerformCustomBuild(CreateCustomBuildOptions(BuildTarget.StandaloneLinux64));
}

[MenuItem("Tools/Build/macOS")]
public static void BuildMacOS()
{
BuildUtils.PerformCustomBuild(CreateCustomBuildOptions(BuildTarget.StandaloneOSX));
}

[MenuItem("Tools/Build/Android - Build apk")]
public static void BuildAndroidApk()
{
BuildUtils.PerformCustomBuild(CreateCustomBuildOptions(BuildTarget.Android));
}

[MenuItem("Tools/Build/Android - Build and run apk")]
public static void BuildAndRunAndroidApk()
{
CustomBuildOptions customBuildOptions = CreateCustomBuildOptions(BuildTarget.Android);
customBuildOptions.buildOptions = BuildOptions.AutoRunPlayer;
BuildUtils.PerformCustomBuild(customBuildOptions);
}

[MenuItem("Tools/Build/Android - Build and run signed apk")]
public static void BuildAndRunSignedAndroidApk()
{
CustomBuildOptions customBuildOptions = CreateCustomBuildOptions(BuildTarget.Android);
customBuildOptions.buildOptions = BuildOptions.AutoRunPlayer;
customBuildOptions.configureKeystoreForAndroidBuild = true;
BuildUtils.PerformCustomBuild(customBuildOptions);
}

[MenuItem("Tools/Build/Android - Build and run signed app bundle")]
public static void BuildAndRunSignedAndroidAppBundle()
{
CustomBuildOptions customBuildOptions = CreateCustomBuildOptions(BuildTarget.Android);
customBuildOptions.buildOptions = BuildOptions.AutoRunPlayer;
customBuildOptions.configureKeystoreForAndroidBuild = true;
customBuildOptions.buildAppBundleForGooglePlay = true;
BuildUtils.PerformCustomBuild(customBuildOptions);
}

[MenuItem("Tools/Build/iOS")]
public static void BuildIOS()
{
BuildUtils.PerformCustomBuild(CreateCustomBuildOptions(BuildTarget.iOS));
}

private static CustomBuildOptions CreateCustomBuildOptions(BuildTarget buildTarget)
{
CustomBuildOptions customBuildOptions = new CustomBuildOptions(appName, buildTarget);
customBuildOptions.compressOutputFolderToZipFile = true;
return customBuildOptions;
}
}
Loading

0 comments on commit 63047be

Please sign in to comment.