diff --git a/.github/actions/setup-environment/action.yml b/.github/actions/setup-environment/action.yml new file mode 100644 index 000000000..a664f256c --- /dev/null +++ b/.github/actions/setup-environment/action.yml @@ -0,0 +1,26 @@ +name: 'Setup Environment' +description: 'Common setup steps for Unity release workflows (Git config and environment prep)' + +inputs: + gh_token: + description: 'GitHub token for gh CLI authentication' + required: true + +runs: + using: 'composite' + steps: + - name: Configure Git + shell: bash + run: | + git config --global user.email "github-actions[bot]@users.noreply.github.com" + git config --global user.name "github-actions[bot]" + + - name: Prepare Environment + env: + GH_TOKEN: ${{ inputs.gh_token }} + shell: bash + run: | + sudo apt-get update + sudo apt-get install -y gh jq || true + gh auth status || gh auth login --with-token <<< "$GH_TOKEN" + diff --git a/.github/workflows/create-release-pr.yml b/.github/workflows/create-release-pr.yml new file mode 100644 index 000000000..73fcb3fa0 --- /dev/null +++ b/.github/workflows/create-release-pr.yml @@ -0,0 +1,262 @@ +name: Create Unity Release PR + +on: + # For making a release pr from android / ios sdk actions + workflow_call: + inputs: + unity_version: + description: 'New Unity Version (e.g., 5.2.15 or 5.2.15-beta.1)' + required: true + type: string + android_version: + description: 'New Android SDK Version (e.g., 2.3.0). Leave blank to skip.' + required: false + type: string + ios_version: + description: 'New iOS SDK Version (e.g., 1.5.0). Leave blank to skip.' + required: false + type: string + + # For making a release pr from github actions + workflow_dispatch: + inputs: + unity_version: + description: 'New Unity Version (e.g., 5.2.15 or 5.2.15-beta.1)' + required: true + type: string + android_version: + description: 'New Android SDK Version (e.g., 2.3.0). Leave blank to skip.' + required: false + type: string + ios_version: + description: 'New iOS SDK Version (e.g., 1.5.0). Leave blank to skip.' + required: false + type: string + +permissions: + contents: write + pull-requests: write + +jobs: + prep: + uses: OneSignal/sdk-actions/.github/workflows/prep-release.yml@main + with: + version: ${{ inputs.unity_version }} + + # Unity specific steps + update-version: + needs: prep + runs-on: ubuntu-latest + outputs: + unity_from: ${{ steps.current_versions.outputs.unity_from }} + ios_from: ${{ steps.current_versions.outputs.ios_from }} + android_from: ${{ steps.current_versions.outputs.android_from }} + + steps: + - name: Checkout + uses: actions/checkout@v5 + with: + ref: ${{ needs.prep.outputs.release_branch }} + + - name: Setup Environment + uses: ./.github/actions/setup-environment + with: + gh_token: ${{ secrets.GITHUB_TOKEN }} + + - name: Get current native SDK versions + id: current_versions + run: | + # Current Unity version + CURRENT_VERSION=$(cat OneSignalExample/Assets/OneSignal/VERSION | tr -d '\n\r' | xargs) + + # Extract current Android SDK version + ANDROID_VERSION=$(grep -oE 'spec="com.onesignal:OneSignal:[0-9]+\.[0-9]+\.[0-9]+"' com.onesignal.unity.android/Editor/OneSignalAndroidDependencies.xml | sed -E 's/.*OneSignal:([0-9]+\.[0-9]+\.[0-9]+)".*/\1/' | head -1) + + # Extract current iOS SDK version + IOS_VERSION=$(grep -oE 'version="[0-9.]+"' com.onesignal.unity.ios/Editor/OneSignaliOSDependencies.xml | grep -oE '[0-9.]+' | head -1) + + echo "unity_from=${CURRENT_VERSION}" >> $GITHUB_OUTPUT + echo "android_from=${ANDROID_VERSION}" >> $GITHUB_OUTPUT + echo "ios_from=${IOS_VERSION}" >> $GITHUB_OUTPUT + + echo " unity_from: ${CURRENT_VERSION}" + echo " android_from: ${ANDROID_VERSION}" + echo " ios_from: ${IOS_VERSION}" + + - name: Update Android SDK version + if: inputs.android_version != '' + run: | + VERSION="${{ inputs.android_version }}" + + # Validate version exists on GitHub + RELEASE=$(curl -s -H "Authorization: token ${{ github.token }}" \ + "https://api.github.com/repos/OneSignal/OneSignal-Android-SDK/releases/tags/${VERSION}") + + if [ -z "$RELEASE" ]; then + echo "✗ Android SDK version ${VERSION} not found" + exit 1 + fi + + sed -i -E "s/spec=\"com\.onesignal:OneSignal:[0-9][0-9.]*\"/spec=\"com.onesignal:OneSignal:$VERSION\"/" com.onesignal.unity.android/Editor/OneSignalAndroidDependencies.xml + sed -i -E "s/'com\.onesignal:OneSignal:[0-9][0-9.]*'/'com.onesignal:OneSignal:$VERSION'/" OneSignalExample/Assets/Plugins/Android/mainTemplate.gradle + sed -i -E "s/com\.onesignal:OneSignal:[0-9][0-9.]*<\/package>/com.onesignal:OneSignal:$VERSION<\/package>/" OneSignalExample/ProjectSettings/AndroidResolverDependencies.xml + + echo "✓ Updated Android SDK to ${VERSION}" + git add . + git commit -m "Bump Android SDK $VERSION" + git push + + - name: Update iOS SDK version + if: inputs.ios_version != '' + run: | + VERSION="${{ inputs.ios_version }}" + + # Validate version exists on GitHub + RELEASE=$(curl -s -H "Authorization: token ${{ github.token }}" \ + "https://api.github.com/repos/OneSignal/OneSignal-iOS-SDK/releases/tags/${VERSION}") + + if [ -z "$RELEASE" ]; then + echo "✗ iOS SDK version ${VERSION} not found" + exit 1 + fi + + sed -i -E "s/version=\"[0-9][0-9.]*\"/version=\"$VERSION\"/" com.onesignal.unity.ios/Editor/OneSignaliOSDependencies.xml + + echo "✓ Updated iOS SDK to ${VERSION}" + git add . + git commit -m "Bump iOS SDK $VERSION" + git push + + create-pr: + needs: [prep, update-version] + uses: OneSignal/sdk-actions/.github/workflows/create-release.yml@main + with: + release_branch: ${{ needs.prep.outputs.release_branch }} + version_from: ${{ needs.update-version.outputs.unity_from }} + version_to: ${{ inputs.unity_version }} + android_from: ${{ needs.update-version.outputs.android_from }} + android_to: ${{ inputs.android_version }} + ios_from: ${{ needs.update-version.outputs.ios_from }} + ios_to: ${{ inputs.ios_version }} + + draft-release: + needs: [prep, update-version] + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v5 + with: + ref: ${{ needs.prep.outputs.release_branch }} + + - name: Setup Environment + uses: ./.github/actions/setup-environment + with: + gh_token: ${{ secrets.GITHUB_TOKEN }} + + - name: Update Unity SDK version + run: | + echo "Updating Unity SDK version to ${{ inputs.unity_version }}" + + # Version string formats + PADDED_VERSION=$(printf "%06d" $(echo "${{ inputs.unity_version }}" | sed 's/[^0-9]//g')) + + # VERSION file + echo "${{ inputs.unity_version }}" > OneSignalExample/Assets/OneSignal/VERSION + + # package.json files + for file in com.onesignal.unity.core/package.json com.onesignal.unity.android/package.json com.onesignal.unity.ios/package.json; do + sed -i "s/\"version\": \".*\"/\"version\": \"${{ inputs.unity_version }}\"/" "$file" + sed -i "s/\"com.onesignal.unity.core\": \".*\"/\"com.onesignal.unity.core\": \"${{ inputs.unity_version }}\"/" "$file" + done + + sed -i "s/public const string Version = \".*\"/public const string Version = \"${{ inputs.unity_version }}\"/" \ + com.onesignal.unity.core/Runtime/OneSignal.cs + sed -i "s/public const string VersionHeader = \".*\"/public const string VersionHeader = \"${PADDED_VERSION}\"/" \ + com.onesignal.unity.core/Runtime/OneSignalPlatform.cs + + # asmdef files + for asm in \ + OneSignalExample/Assets/OneSignal/Example/OneSignal.UnityPackage.Example.asmdef \ + OneSignalExample/Assets/OneSignal/Editor/OneSignal.UnityPackage.Editor.asmdef \ + OneSignalExample/Assets/OneSignal/Attribution/OneSignal.UnityPackage.Attribution.asmdef; do + sed -i "s/\"expression\": \".*\"/\"expression\": \"${{ inputs.unity_version }}\"/" "$asm" + done + + # packages-lock.json + sed -i "s/\"com.onesignal.unity.core\": \"[0-9.]\+\"/\"com.onesignal.unity.core\": \"${{ inputs.unity_version }}\"/g" \ + OneSignalExample/Packages/packages-lock.json + + # ProjectSettings.asset + sed -i "s/bundleVersion: .*/bundleVersion: ${{ inputs.unity_version }}/" \ + OneSignalExample/ProjectSettings/ProjectSettings.asset + + # iOS plugin version (UIApplication+OneSignalUnity.mm) + sed -i "s/setSdkVersion:@\"[0-9]*\"/setSdkVersion:@\"${PADDED_VERSION}\"/" \ + com.onesignal.unity.ios/Runtime/Plugins/iOS/UIApplication+OneSignalUnity.mm + + # to save time, use cached Unity installation if available + - name: Cache Unity + uses: actions/cache@v4 + with: + path: /home/runner/Unity/Hub + key: UnityEditor-${{ runner.os }} + restore-keys: | + UnityEditor-${{ runner.os }} + + # setup Unity using the version file + - name: Setup Unity + uses: buildalon/unity-setup@v2.1.1 + with: + version-file: 'OneSignalExample/ProjectSettings/ProjectVersion.txt' + + # need to activate the Unity license to run Unity in batchmode; required for exportPackage + - uses: buildalon/activate-unity-license@v2 + with: + license: 'Personal' + username: '${{ secrets.UNITY_USERNAME }}' + password: '${{ secrets.UNITY_PASSWORD }}' + + - name: Cleaning up Unity locks + run: | + pkill -f Unity || true + rm -f OneSignalExample/Temp/UnityLockfile + rm -rf OneSignalExample/Library OneSignalExample/Temp OneSignalExample/obj OneSignalExample/UserSettings || true + + - name: Run UpdateProjectVersion + uses: buildalon/unity-action@v3 + with: + project-path: OneSignalExample + args: -quit -batchmode -nographics -buildTarget Android -executeMethod OneSignalSDK.OneSignalPackagePublisher.UpdateProjectVersion + + - name: Run ExportUnityPackage + uses: buildalon/unity-action@v3 + with: + project-path: OneSignalExample + args: -quit -batchmode -nographics -buildTarget Android -executeMethod OneSignalSDK.OneSignalPackagePublisher.ExportUnityPackage + + - name: Commit Release + run: | + git add . + git commit -m "Release ${{ inputs.unity_version }}" + git push + + - name: Debug — list Unity package files + run: | + echo "Current working directory:" + pwd + echo "" + echo "List of all files under OneSignalExample:" + ls -Rlh OneSignalExample || true + echo "" + echo "Searching for .unitypackage files:" + find OneSignalExample -type f -name "*.unitypackage" -print + + - name: Draft Release + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + package_path="OneSignalExample/OneSignal-v${{ inputs.unity_version }}.unitypackage" + gh release create "${{ inputs.unity_version }}" "${package_path}"\ + --draft\ + --title "${{ inputs.unity_version }} Release"\ + --notes "TODO" \ No newline at end of file diff --git a/OneSignalExample/Assets/OneSignal/Attribution/OneSignal.UnityPackage.Attribution.asmdef b/OneSignalExample/Assets/OneSignal/Attribution/OneSignal.UnityPackage.Attribution.asmdef index a82956cd8..93c02f119 100644 --- a/OneSignalExample/Assets/OneSignal/Attribution/OneSignal.UnityPackage.Attribution.asmdef +++ b/OneSignalExample/Assets/OneSignal/Attribution/OneSignal.UnityPackage.Attribution.asmdef @@ -16,7 +16,7 @@ "versionDefines": [ { "name": "com.onesignal.unity.core", - "expression": "5.1.15", + "expression": "5.2.15", "define": "ONE_SIGNAL_INSTALLED" } ], diff --git a/OneSignalExample/Assets/OneSignal/Editor/OneSignal.UnityPackage.Editor.asmdef b/OneSignalExample/Assets/OneSignal/Editor/OneSignal.UnityPackage.Editor.asmdef index d90ee149f..88f9604bc 100644 --- a/OneSignalExample/Assets/OneSignal/Editor/OneSignal.UnityPackage.Editor.asmdef +++ b/OneSignalExample/Assets/OneSignal/Editor/OneSignal.UnityPackage.Editor.asmdef @@ -16,7 +16,7 @@ "versionDefines": [ { "name": "com.onesignal.unity.core", - "expression": "5.1.15", + "expression": "5.2.15", "define": "ONE_SIGNAL_INSTALLED" } ], diff --git a/OneSignalExample/Assets/OneSignal/Example/OneSignal.UnityPackage.Example.asmdef b/OneSignalExample/Assets/OneSignal/Example/OneSignal.UnityPackage.Example.asmdef index e99841511..3b4282c98 100644 --- a/OneSignalExample/Assets/OneSignal/Example/OneSignal.UnityPackage.Example.asmdef +++ b/OneSignalExample/Assets/OneSignal/Example/OneSignal.UnityPackage.Example.asmdef @@ -18,7 +18,7 @@ "versionDefines": [ { "name": "com.onesignal.unity.core", - "expression": "5.1.15", + "expression": "5.2.15", "define": "ONE_SIGNAL_INSTALLED" } ], diff --git a/OneSignalExample/Assets/OneSignal/VERSION b/OneSignalExample/Assets/OneSignal/VERSION index 40dc92612..433f09dcf 100755 --- a/OneSignalExample/Assets/OneSignal/VERSION +++ b/OneSignalExample/Assets/OneSignal/VERSION @@ -1 +1 @@ -5.1.15 \ No newline at end of file +5.2.15 diff --git a/OneSignalExample/Assets/OneSignalPackager/Editor/OneSignalPackagePublisher.cs b/OneSignalExample/Assets/OneSignalPackager/Editor/OneSignalPackagePublisher.cs index 6c9a8d768..b6630d245 100644 --- a/OneSignalExample/Assets/OneSignalPackager/Editor/OneSignalPackagePublisher.cs +++ b/OneSignalExample/Assets/OneSignalPackager/Editor/OneSignalPackagePublisher.cs @@ -45,12 +45,24 @@ public static void UpdateProjectVersion() [MenuItem("OneSignal/ExportUnityPackage")] public static void ExportUnityPackage() { + UnityEngine.Debug.Log($"[OneSignalPackagePublisher] start exporting package"); AssetDatabase.Refresh(); var packageVersion = File.ReadAllText(VersionFilePath); var packageName = $"OneSignal-v{packageVersion}.unitypackage"; + UnityEngine.Debug.Log($"[OneSignalPackagePublisher] package name: {packageName}"); + + string[] filePaths = _filePaths(); + UnityEngine.Debug.Log( + $"[OneSignalPackagePublisher] Found {filePaths.Length} files/directories to include:" + ); + foreach (var path in filePaths) + { + UnityEngine.Debug.Log($"[OneSignalPackagePublisher] - {path}"); + } + AssetDatabase.ExportPackage( - _filePaths(), + filePaths, packageName, ExportPackageOptions.Recurse | ExportPackageOptions.IncludeDependencies ); @@ -68,6 +80,9 @@ public static void ExportUnityPackage() private static string[] _filePaths() { var files = Directory.GetFileSystemEntries(PackagePath); + UnityEngine.Debug.Log( + $"[OneSignalPackagePublisher] Getting file paths from: {PackagePath}" + ); var pathsToInclude = files.Where(file => { if (file.EndsWith(".meta")) diff --git a/OneSignalExample/Assets/Plugins/Android/mainTemplate.gradle b/OneSignalExample/Assets/Plugins/Android/mainTemplate.gradle index 8367ed164..9059180e0 100644 --- a/OneSignalExample/Assets/Plugins/Android/mainTemplate.gradle +++ b/OneSignalExample/Assets/Plugins/Android/mainTemplate.gradle @@ -6,7 +6,7 @@ apply plugin: 'com.android.library' dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) // Android Resolver Dependencies Start - implementation 'com.onesignal:OneSignal:5.1.37' // Packages/com.onesignal.unity.android/Editor/OneSignalAndroidDependencies.xml:6 + implementation 'com.onesignal:OneSignal:5.1.38' // Packages/com.onesignal.unity.android/Editor/OneSignalAndroidDependencies.xml:6 // Android Resolver Dependencies End **DEPS**} diff --git a/OneSignalExample/Packages/manifest.json b/OneSignalExample/Packages/manifest.json index 27c34a1fd..8fdadad72 100644 --- a/OneSignalExample/Packages/manifest.json +++ b/OneSignalExample/Packages/manifest.json @@ -10,6 +10,7 @@ "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.7.5", + "com.unity.toolchain.linux-x86_64": "2.0.11", "com.unity.toolchain.macos-x86_64-linux-x86_64": "2.0.4", "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.4", "com.unity.ugui": "1.0.0", diff --git a/OneSignalExample/Packages/packages-lock.json b/OneSignalExample/Packages/packages-lock.json index ff60483fa..a6b1da7f8 100644 --- a/OneSignalExample/Packages/packages-lock.json +++ b/OneSignalExample/Packages/packages-lock.json @@ -5,7 +5,7 @@ "depth": 0, "source": "local", "dependencies": { - "com.onesignal.unity.core": "5.1.15" + "com.onesignal.unity.core": "5.2.15" } }, "com.onesignal.unity.core": { @@ -19,11 +19,11 @@ "depth": 0, "source": "local", "dependencies": { - "com.onesignal.unity.core": "5.1.15" + "com.onesignal.unity.core": "5.2.15" } }, "com.unity.ai.navigation": { - "version": "1.1.5", + "version": "1.1.4", "depth": 0, "source": "registry", "dependencies": { @@ -45,7 +45,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.35", + "version": "3.0.24", "depth": 0, "source": "registry", "dependencies": { @@ -54,7 +54,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.22", + "version": "2.0.18", "depth": 0, "source": "registry", "dependencies": { @@ -70,18 +70,18 @@ "url": "https://packages.unity.com" }, "com.unity.sysroot": { - "version": "2.0.5", + "version": "2.0.10", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.sysroot.linux-x86_64": { - "version": "2.0.4", + "version": "2.0.9", "depth": 1, "source": "registry", "dependencies": { - "com.unity.sysroot": "2.0.5" + "com.unity.sysroot": "2.0.10" }, "url": "https://packages.unity.com" }, @@ -97,7 +97,7 @@ "url": "https://packages.unity.com" }, "com.unity.textmeshpro": { - "version": "3.0.7", + "version": "3.0.6", "depth": 0, "source": "registry", "dependencies": { @@ -106,17 +106,27 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.7.7", + "version": "1.7.5", "depth": 0, "source": "registry", "dependencies": { - "com.unity.modules.audio": "1.0.0", "com.unity.modules.director": "1.0.0", "com.unity.modules.animation": "1.0.0", + "com.unity.modules.audio": "1.0.0", "com.unity.modules.particlesystem": "1.0.0" }, "url": "https://packages.unity.com" }, + "com.unity.toolchain.linux-x86_64": { + "version": "2.0.11", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.sysroot": "2.0.10", + "com.unity.sysroot.linux-x86_64": "2.0.9" + }, + "url": "https://packages.unity.com" + }, "com.unity.toolchain.macos-x86_64-linux-x86_64": { "version": "2.0.4", "depth": 0, diff --git a/OneSignalExample/ProjectSettings/AndroidResolverDependencies.xml b/OneSignalExample/ProjectSettings/AndroidResolverDependencies.xml index a8f902665..8d6a24f89 100644 --- a/OneSignalExample/ProjectSettings/AndroidResolverDependencies.xml +++ b/OneSignalExample/ProjectSettings/AndroidResolverDependencies.xml @@ -1,6 +1,6 @@ - com.onesignal:OneSignal:5.1.37 + com.onesignal:OneSignal:5.1.38 diff --git a/OneSignalExample/ProjectSettings/GvhProjectSettings.xml b/OneSignalExample/ProjectSettings/GvhProjectSettings.xml index b3045b0d4..217d2faba 100644 --- a/OneSignalExample/ProjectSettings/GvhProjectSettings.xml +++ b/OneSignalExample/ProjectSettings/GvhProjectSettings.xml @@ -1,10 +1,7 @@ - - + + @@ -21,4 +18,4 @@ - + \ No newline at end of file diff --git a/OneSignalExample/ProjectSettings/ProjectSettings.asset b/OneSignalExample/ProjectSettings/ProjectSettings.asset index b79c27ffe..dec6c871e 100644 --- a/OneSignalExample/ProjectSettings/ProjectSettings.asset +++ b/OneSignalExample/ProjectSettings/ProjectSettings.asset @@ -48,7 +48,6 @@ PlayerSettings: defaultScreenHeightWeb: 600 m_StereoRenderingPath: 0 m_ActiveColorSpace: 0 - unsupportedMSAAFallback: 0 m_SpriteBatchVertexThreshold: 300 m_MTRendering: 1 mipStripping: 0 @@ -76,8 +75,6 @@ PlayerSettings: androidMinimumWindowWidth: 400 androidMinimumWindowHeight: 300 androidFullscreenMode: 1 - androidAutoRotationBehavior: 1 - androidPredictiveBackSupport: 0 defaultIsNativeResolution: 1 macRetinaSupport: 1 runInBackground: 1 @@ -85,7 +82,6 @@ PlayerSettings: muteOtherAudioSources: 0 Prepare IOS For Recording: 0 Force IOS Speakers When Recording: 0 - audioSpatialExperience: 0 deferSystemGesturesMode: 0 hideHomeButton: 0 submitAnalytics: 1 @@ -139,9 +135,9 @@ PlayerSettings: vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 loadStoreDebugModeEnabled: 0 - visionOSBundleVersion: 1.0 - tvOSBundleVersion: 1.0 - bundleVersion: 5.1.15 + bundleVersion: '5.2.15 + +' preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -153,7 +149,6 @@ PlayerSettings: isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 enableOpenGLProfilerGPURecorders: 1 - allowHDRDisplaySupport: 0 useHDRDisplay: 0 hdrBitDepth: 0 m_ColorGamuts: 00000000 @@ -188,10 +183,8 @@ PlayerSettings: strictShaderVariantMatching: 0 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iOSSimulatorArchitecture: 0 iOSTargetOSVersionString: 12.0 tvOSSdkVersion: 0 - tvOSSimulatorArchitecture: 0 tvOSRequireExtendedGameController: 0 tvOSTargetOSVersionString: 12.0 VisionOSSdkVersion: 0 @@ -238,7 +231,6 @@ PlayerSettings: iOSMetalForceHardShadows: 0 metalEditorSupport: 1 metalAPIValidation: 1 - metalCompileShaderBinary: 0 iOSRenderExtraFrameOnPause: 0 iosCopyPluginsCodeInsteadOfSymlink: 0 appleDeveloperTeamID: @@ -523,6 +515,7 @@ PlayerSettings: switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 switchEnableFileSystemTrace: 0 + switchUseGOLDLinker: 0 switchLTOSetting: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: @@ -652,7 +645,7 @@ PlayerSettings: switchSocketBufferEfficiency: 4 switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 - switchDisableHTCSPlayerConnection: 0 + switchPlayerConnectionEnabled: 1 switchUseNewStyleFilepaths: 0 switchUseLegacyFmodPriorities: 0 switchUseMicroSleepForYield: 1 @@ -823,7 +816,6 @@ PlayerSettings: metroTileBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, a: 0} metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628, a: 1} metroSplashScreenUseBackgroundColor: 0 - syncCapabilities: 0 platformCapabilities: {} metroTargetDeviceFamilies: {} metroFTAName: diff --git a/OneSignalExample/UserSettings/EditorUserSettings.asset b/OneSignalExample/UserSettings/EditorUserSettings.asset index 2192a14f8..d1ecbdffe 100644 --- a/OneSignalExample/UserSettings/EditorUserSettings.asset +++ b/OneSignalExample/UserSettings/EditorUserSettings.asset @@ -5,9 +5,6 @@ EditorUserSettings: m_ObjectHideFlags: 0 serializedVersion: 4 m_ConfigSettings: - RecentlyUsedScenePath-0: - value: 2242470311464674030b3f2b172d5e1c5932002b21382a3562061336d1e93336e3eb13f1e6372f303c31ec390a3b4f2afc031d12 - flags: 0 vcSharedLogLevel: value: 0d5e400f0650 flags: 0 @@ -16,9 +13,13 @@ EditorUserSettings: m_VCDebugCmd: 0 m_VCDebugOut: 0 m_SemanticMergeMode: 2 + m_DesiredImportWorkerCount: 1 + m_StandbyImportWorkerCount: 1 + m_IdleImportWorkerShutdownDelay: 60000 m_VCShowFailedCheckout: 1 m_VCOverwriteFailedCheckoutAssets: 1 m_VCProjectOverlayIcons: 1 m_VCHierarchyOverlayIcons: 1 m_VCOtherOverlayIcons: 1 m_VCAllowAsyncUpdate: 1 + m_ArtifactGarbageCollection: 1 diff --git a/OneSignalExample/UserSettings/Search.index b/OneSignalExample/UserSettings/Search.index deleted file mode 100644 index dba62d53a..000000000 --- a/OneSignalExample/UserSettings/Search.index +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name": "Assets", - "roots": ["Assets"], - "includes": [], - "excludes": [], - "options": { - "types": true, - "properties": true, - "extended": false, - "dependencies": false - }, - "baseScore": 999 -} \ No newline at end of file diff --git a/com.onesignal.unity.android/Editor/OneSignalAndroidDependencies.xml b/com.onesignal.unity.android/Editor/OneSignalAndroidDependencies.xml index ef098636b..06a843794 100644 --- a/com.onesignal.unity.android/Editor/OneSignalAndroidDependencies.xml +++ b/com.onesignal.unity.android/Editor/OneSignalAndroidDependencies.xml @@ -3,6 +3,6 @@ https://repo.maven.apache.org/maven2 - + diff --git a/com.onesignal.unity.android/package.json b/com.onesignal.unity.android/package.json index e92df9e18..306f05ab9 100644 --- a/com.onesignal.unity.android/package.json +++ b/com.onesignal.unity.android/package.json @@ -1,11 +1,11 @@ { "name": "com.onesignal.unity.android", "displayName": "OneSignal Unity SDK - Android", - "version": "5.1.15", + "version": "5.2.15", "unity": "2018.4", "description": "OneSignal is the market leader in customer engagement, powering mobile push, web push, email, and in-app messages.", "dependencies": { - "com.onesignal.unity.core": "5.1.15" + "com.onesignal.unity.core": "5.2.15" }, "keywords": [ "push-notifications", diff --git a/com.onesignal.unity.core/Runtime/OneSignal.cs b/com.onesignal.unity.core/Runtime/OneSignal.cs index 60e43c492..cba1c45ed 100755 --- a/com.onesignal.unity.core/Runtime/OneSignal.cs +++ b/com.onesignal.unity.core/Runtime/OneSignal.cs @@ -42,7 +42,7 @@ namespace OneSignalSDK /// public static partial class OneSignal { - public const string Version = "5.1.15"; + public const string Version = "5.2.15"; /// /// The default static instance of the OneSignal Unity SDK diff --git a/com.onesignal.unity.core/Runtime/OneSignalPlatform.cs b/com.onesignal.unity.core/Runtime/OneSignalPlatform.cs index 34d1420f8..b46364ab8 100644 --- a/com.onesignal.unity.core/Runtime/OneSignalPlatform.cs +++ b/com.onesignal.unity.core/Runtime/OneSignalPlatform.cs @@ -40,7 +40,7 @@ namespace OneSignalSDK { public abstract class OneSignalPlatform { - public const string VersionHeader = "050115"; + public const string VersionHeader = "005215"; internal static event Action OnInitialize; diff --git a/com.onesignal.unity.core/package.json b/com.onesignal.unity.core/package.json index 5411e1d92..2e2efa57b 100644 --- a/com.onesignal.unity.core/package.json +++ b/com.onesignal.unity.core/package.json @@ -1,7 +1,7 @@ { "name": "com.onesignal.unity.core", "displayName": "OneSignal Unity SDK - Core", - "version": "5.1.15", + "version": "5.2.15", "unity": "2018.4", "description": "OneSignal is the market leader in customer engagement, powering mobile push, web push, email, and in-app messages.", "dependencies": { diff --git a/com.onesignal.unity.ios/Editor/OneSignaliOSDependencies.xml b/com.onesignal.unity.ios/Editor/OneSignaliOSDependencies.xml index ba5b6bff1..922ae934e 100644 --- a/com.onesignal.unity.ios/Editor/OneSignaliOSDependencies.xml +++ b/com.onesignal.unity.ios/Editor/OneSignaliOSDependencies.xml @@ -1,5 +1,5 @@  - + diff --git a/com.onesignal.unity.ios/Runtime/Plugins/iOS/UIApplication+OneSignalUnity.mm b/com.onesignal.unity.ios/Runtime/Plugins/iOS/UIApplication+OneSignalUnity.mm index 651acf37b..7bdee9387 100644 --- a/com.onesignal.unity.ios/Runtime/Plugins/iOS/UIApplication+OneSignalUnity.mm +++ b/com.onesignal.unity.ios/Runtime/Plugins/iOS/UIApplication+OneSignalUnity.mm @@ -97,7 +97,7 @@ - (void)setOneSignalUnityDelegate:(id )delegate { - (BOOL)oneSignalApplication:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { [OneSignalWrapper setSdkType:@"unity"]; - [OneSignalWrapper setSdkVersion:@"050115"]; + [OneSignalWrapper setSdkVersion:@"005215"]; [OneSignal initialize:nil withLaunchOptions:launchOptions]; if ([self respondsToSelector:@selector(oneSignalApplication:didFinishLaunchingWithOptions:)]) diff --git a/com.onesignal.unity.ios/package.json b/com.onesignal.unity.ios/package.json index b1b1c8a24..dc1579913 100644 --- a/com.onesignal.unity.ios/package.json +++ b/com.onesignal.unity.ios/package.json @@ -1,11 +1,11 @@ { "name": "com.onesignal.unity.ios", "displayName": "OneSignal Unity SDK - iOS", - "version": "5.1.15", + "version": "5.2.15", "unity": "2018.4", "description": "OneSignal is the market leader in customer engagement, powering mobile push, web push, email, and in-app messages.", "dependencies": { - "com.onesignal.unity.core": "5.1.15" + "com.onesignal.unity.core": "5.2.15" }, "keywords": [ "push-notifications",