Merge pull request #873 from PlayEveryWare/release-3.3.2

Release 3.3.2

.github/workflows/check-for-package-difference.yml

@@ -0,0 +1,85 @@
+# Check package.json to see if the version number is different.
+# If it isn't changed, then yell at the user.
+
+name: "CheckPackageVersionChanged"
+
+on:
+  push:
+    branches: [ "stable" ]
+  pull_request:
+    branches: [ "stable" ]
+  workflow_call:
+    inputs:
+      new-branch:
+        description: 'Branch that contains changes. If the context does not have a branch, use this. If context is not provided, this is required.'
+        required: false
+        default: ''
+        type: string
+      old-branch:
+        description: 'Branch to compare against. Defaults to main, should be whatever branch is the primary branch.'
+        required: false
+        default: 'stable'
+        type: string
+      package-location:
+        description: 'File path to the package.json file to check. Includes the name of the file.'
+        required: false
+        default: 'com.playeveryware.eos/package.json'
+        type: string
+
+env:
+ NEW_BRANCH_NAME: ${{ github.head_ref || github.ref_name || inputs.new-branch || 'stable' }}
+ OLD_BRANCH_NAME: ${{ inputs.old-branch || 'stable' }}
+ PACKAGE_LOCATION: ${{ inputs.package-location }}
+
+jobs:
+  check_package_version_changed:
+    runs-on: ubuntu-latest
+
+    steps:    
+      - name: Get New Package.json
+        id: get_new_package_json
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const response = await github.rest.repos.getContent({
+             owner: context.repo.owner,
+             repo: context.repo.repo,
+             path: 'com.playeveryware.eos/package.json',
+             ref: '${{ env.NEW_BRANCH_NAME }}'
+            });
+
+            return Buffer.from(response.data.content, response.data.encoding).toString('utf-8');
+          result-encoding: string
+
+      - name: Get Old Package.json
+        id: get_old_package_json
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const response = await github.rest.repos.getContent({
+             owner: context.repo.owner,
+             repo: context.repo.repo,
+             path: 'etc/PackageTemplate/package.json',
+             ref: '${{ env.OLD_BRANCH_NAME }}'
+            });
+
+            return Buffer.from(response.data.content, response.data.encoding).toString('utf-8');
+          result-encoding: string
+
+      - name: Extract Value of New Package.json
+        run: |
+          echo "new_package_value=${{ fromJson(steps.get_new_package_json.outputs.result).version }}" >> $Env:GITHUB_ENV
+        shell: 
+          pwsh
+
+      - name: Extract Value of Old Package.json
+        run: |
+          echo "old_package_value=${{ fromJson(steps.get_old_package_json.outputs.result).version }}" >> $Env:GITHUB_ENV
+        shell: 
+          pwsh
+
+      - name: Compare package.json values
+        if: ${{ Env.old_package_value == Env.new_package_value }}
+        run: |
+          echo "::error file=toplevelfile.json::The package.json version was not changed between commits. Failing job."
+          exit 1

.github/workflows/unity-version-badge.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Read Unity Version
         id: read_unity_version
@@ -21,15 +21,29 @@ jobs:
 
       - name: Update README with Badge
         run: |
-          badge_url="https://img.shields.io/badge/Unity-$UNITY_VERSION-brightgreen"
+          badge_url="https://img.shields.io/badge/Unity-$UNITY_VERSION-blue"
           sed -i 's|!\[Unity\](.*)|![Unity]('"$badge_url"')|' README.md
-          sed -i 's|!\[Unity\](.*)|![Unity]('"$badge_url"')|' etc/PackageTemplate/README.md
+          sed -i 's|!\[Unity\](.*)|![Unity]('"$badge_url"')|' com.playeveryware.eos/README.md
+
+      - name: Check for changes
+        id: check_changes
+        run: |
+          if [ -n "$(git status --porcelain)" ]; then
+            echo "changes=true" >> $GITHUB_ENV
+          else
+            echo "changes=false" >> $GITHUB_ENV
+          fi
 
       - name: Commit changes
+        if: env.changes == 'true'
         run: |
           git config --global user.name 'github-actions'
           git config --global user.email '[email protected]'
           git add README.md
-          git add etc/PackageTemplate/README.md
+          git add com.playeveryware.eos/README.md
           git commit -m "Update Unity version badge to $UNITY_VERSION"
           git push
+
+      - name: No changes to commit
+        if: env.changes == 'false'
+        run: echo "No changes to commit"

.gitignore

@@ -118,7 +118,6 @@ Sessionx.vim
 
 # Temporary
 .netrwhist
-*~
 # Auto-generated tag files
 tags
 # Persistent undo
@@ -156,4 +155,5 @@ EOSPluginEditorConfiguration/
 [Aa]ssets/TextMesh*Pro/
 Assets/Plugins/Source/Editor/obj/
 *_BackUpThisFolder_ButDontShipItWithYourGame*
-*_BurstDebugInformation_DoNotShip*
+*_BurstDebugInformation_DoNotShip*
+Assets/InitTestScene*

Assets/Plugins/Android/Core/AndroidPlatformSpecifics.cs

@@ -87,10 +87,10 @@ private static void ConfigureAndroidActivity()
         // This does some work to configure the Android side of things before doing the
         // 'normal' EOS init things.
         // TODO: Configure the internal and external directory
-        public override void ConfigureSystemInitOptions(ref EOSInitializeOptions initializeOptionsRef, EOSConfig configData)
+        public override void ConfigureSystemInitOptions(ref EOSInitializeOptions initializeOptionsRef)
         {
             // Do the standard overriding stuff
-            base.ConfigureSystemInitOptions(ref initializeOptionsRef, configData);
+            base.ConfigureSystemInitOptions(ref initializeOptionsRef);
 
             // check again for if it's null after coming out of the base ConfigureSystemInitOptions method
             // (it shouldn't, but check anyways to make compile-time checks happy)

Assets/Plugins/Source/Editor/ConfigEditors/AndroidBuildConfigEditor.cs → Assets/Plugins/Dummyfile.cs

@@ -8,8 +8,8 @@
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
  *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -19,20 +19,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-namespace PlayEveryWare.EpicOnlineServices.Editor
+
+// TODO: This class only serves to remove a warning.
+//       It may be removed if when more files are added to the com.playeveryware.eos assembly.
+namespace PlayEveryWare.EpicOnlineServices
 {
-    using Config;
-    using Utility;
 
-    public class AndroidBuildConfigEditor : ConfigEditor<AndroidBuildConfig>
+    public class EOSDummyClass
     {
-        public AndroidBuildConfigEditor() : base("Android Build Settings")
-        {
-        }
-
-        public override void RenderContents()
-        {
-            GUIEditorUtility.AssigningBoolField("Link EOS Library Dynamically", ref config.DynamicallyLinkEOSLibrary);
-        }
     }
-}
+}