Skip to content

Commit

Permalink
Merge branch 'development' of https://github.com/realitycollective/co…
Browse files Browse the repository at this point in the history
…m.realitytoolkit.devtools into feature/core-compat

# Conflicts:
#	package.json
  • Loading branch information
FejZa committed Sep 11, 2024
2 parents a710020 + 698f3d0 commit 371f909
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
9 changes: 8 additions & 1 deletion .github/workflows/development-buildandtestupmrelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,11 @@ jobs:
with:
unityversion: ${{ needs.Validate-Unity.outputs.unityeditorversion }}
dependencies: '[{"development": "github.com/realitycollective/com.realitycollective.buildtools.git"},{"development": "github.com/realitycollective/com.realitytoolkit.core.git"},{"development": "github.com/realitycollective/com.realitycollective.utilities.git"},{"development": "github.com/realitycollective/com.realitytoolkit.service-framework.git"},{"development": "github.com/realitycollective/com.realitytoolkit.player.git"}]'
secrets: inherit
secrets: inherit

Build-Complete:
runs-on: ubuntu-latest
name: Build completion task
needs: Run-Unit-Tests
steps:
- run: echo "Build Complete"
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"name": "com.realitytoolkit.devtools",
"displayName": "RealityToolkit.DevTools",
"description": "A collection of services, utilities and tools useful for developing immersive experiences using the Reality Toolkit.",
"version": "1.0.3",
"documentationUrl": "https://realitytoolkit.io",
"version": "1.0.3-pre.1",
"documentationUrl": "https://realitytoolkit.realitycollective.net/",
"changelogUrl": "https://github.com/realitycollective/com.realitytoolkit.devtools/releases",
"licensesUrl": "https://github.com/realitycollective/com.realitytoolkit.devtools/blob/main/LICENSE.md",
"keywords": [
Expand All @@ -13,7 +13,7 @@
"Mixed Reality"
],
"unity": "2022.3",
"homepage": "https://realitytoolkit.io",
"homepage": "https://realitytoolkit.realitycollective.net/",
"bugs": {
"url": "https://github.com/realitycollective/com.realitytoolkit.devtools/issues"
},
Expand Down

0 comments on commit 371f909

Please sign in to comment.