Merge branch 'main' into develop

readyplayerme · Oct 24, 2023 · 5cbcdae · 5cbcdae
2 parents aceea41 + 92c84cd
commit 5cbcdae
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 12 deletions.
diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
@@ -53,4 +53,5 @@ jobs:
           projectPath: ${{ matrix.projectPath }}
           checkName: ${{ matrix.unityVersion }} ${{ matrix.testMode }} tests result
           githubToken: ${{ secrets.GITHUB_TOKEN }}
-          coverageOptions: "generateAdditionalMetrics;generateHtmlReport;generateBadgeReport;assemblyFilters:+my.assembly.*"
+          customParameters: assemblyNames "ReadyPlayerMe.Core.Editor.Tests;ReadyPlayerMe.Tests.Editor;ReadyPlayerMe.Tests.Runtime"
+          coverageOptions: "generateAdditionalMetrics;generateHtmlReport;generateBadgeReport;assemblyFilters:+ReadyPlayerMe.*"
diff --git a/.github/workflows/pr-test-runner.yml b/.github/workflows/pr-test-runner.yml
@@ -54,4 +54,5 @@ jobs:
           projectPath: ${{ matrix.projectPath }}
           checkName: ${{ matrix.unityVersion }} ${{ matrix.testMode }} tests result
           githubToken: ${{ secrets.GITHUB_TOKEN }}
-          coverageOptions: "generateAdditionalMetrics;generateHtmlReport;generateBadgeReport;assemblyFilters:+my.assembly.*"
+          customParameters: assemblyNames "ReadyPlayerMe.Core.Editor.Tests;ReadyPlayerMe.Tests.Editor;ReadyPlayerMe.Tests.Runtime"
+          coverageOptions: "generateAdditionalMetrics;generateHtmlReport;generateBadgeReport;assemblyFilters:+ReadyPlayerMe.*"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,7 +3,16 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [3.3.0] - 2023.20.05
+## [3.4.0] - 2023.10.24
+
+### Added
+- breaking change popup @ryuuk in [#136](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/136)
+
+### Updated
+- disable use demo toggle in setup guide [#131](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/131)
+- refactor define symbol add and remove logic [#133](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/133)
+
+## [3.3.0] - 2023.10.05
 
 ### Added
 - moved core iframe and url logic from WebView package @harrisonhough in [#125](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/125)
@@ -95,7 +104,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - discussion link to README.md
 
 ### Updated
-- OpenUPM installation added to README.md
+- openUPM installation added to README.md
 
 ## [1.0.0] - 2023.02.20
 
@@ -104,7 +113,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - don't ask again option for update check
 
 ### Updated
-- PartnerSubdomainSettings refactored to a CoreSettings scriptable object
+- partnerSubdomainSettings refactored to a CoreSettings scriptable object
 
 ### Fixed
 - core settings asset now automatically created if it is missing
@@ -116,10 +125,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - optional sdk logging
 
 ### Updated
-- PartnerSubdomainSettings refactored to a CoreSettings scriptable object
+- partnerSubdomainSettings refactored to a CoreSettings scriptable object
 
 ### Fixed
-- Various bug fixes and improvements
+- various bug fixes and improvements
 
 ## [0.1.0] - 2023.01.22
 
@@ -134,7 +143,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - module installer and updater for handling package installation
 
 ### Updated
-- A big refactor of code and classes
+- a big refactor of code and classes
 
 ### Fixed
-- Various bug fixes and improvements
+- various bug fixes and improvements
diff --git a/README.md b/README.md
@@ -92,7 +92,7 @@ After the process is complete you project will have imported these packages:
         }
      ],
      "dependencies": {
-        "com.readyplayerme.core": "3.3.0"
+        "com.readyplayerme.core": "3.4.0"
        }
      }
      ```

diff --git a/Runtime/Data/ApplicationData.cs b/Runtime/Data/ApplicationData.cs
@@ -6,7 +6,7 @@ namespace ReadyPlayerMe.Core
 {
     public static class ApplicationData
     {
-        private const string SDK_VERSION = "v3.3.0";
+        private const string SDK_VERSION = "v3.4.0";
         private const string TAG = "ApplicationData";
         private const string DEFAULT_RENDER_PIPELINE = "Built-In Render Pipeline";
         private static readonly AppData Data;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.readyplayerme.core",
-  "version": "3.3.0",
+  "version": "3.4.0",
   "displayName": "Ready Player Me Core",
   "description": "This Module contains all the core functionality required for using Ready Player Me avatars in Unity, including features such as: \n - Module management and automatic package setup logic\n - Avatar loading from .glb files\n - Avatar and 2D render requests\n - Optional Analytics\n - Custom editor windows\n - Sample scenes and assets",
   "unity": "2020.3",
-Original file line number
+Diff line change
@@ Expand Up @@
             }
          ],
          "dependencies": {
-            "com.readyplayerme.core": "3.3.0"
+            "com.readyplayerme.core": "3.4.0"
            }
          }
          ```
@@ Expand Down @@