Skip to content

Commit

Permalink
Merge pull request #12 from kurone-kito/maintenance
Browse files Browse the repository at this point in the history
v0.5.2: Maintenance Release
  • Loading branch information
kurone-kito authored Oct 20, 2024
2 parents 472d93c + 0f2f574 commit 17061f3
Show file tree
Hide file tree
Showing 16 changed files with 243 additions and 48 deletions.
5 changes: 4 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,15 @@ indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true

[*.{asmdef,cs,uss}]
[*.{asmdef,cs,index,inputactions,uss,uxml}]
indent_size = 4

[*.{asset,md,meta,prefab,unity}]
trim_trailing_whitespace = false

[Packages/**/AndroidManifest.xml]
indent_size = 4

[Packages/black.kit.*/**/Runtime/**/*.cs]
dotnet_diagnostic.IDE0066.severity = none

Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/build-listing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ jobs:
repository: vrchat-community/package-list-action
path: ${{ env.pathToCi }}
clean: false
- name: Deploy the global.json file
run: cp "${{ github.workspace }}/global.json" "${{ env.pathToCi }}/"
- name: Load cached data from previous runs
uses: actions/cache@v4
with:
Expand All @@ -55,7 +57,7 @@ jobs:
~/.nuget/packages
key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj') }}
- name: Build Package Version Listing with Nuke
run: ${{ env.pathToCi }}/build.cmd BuildRepoListing --root ${{ env.pathToCi }} --list-publish-directory $GITHUB_WORKSPACE/${{ env.listPublishDirectory }} --current-package-name ${{ vars.PACKAGE_NAME }}
run: '"${{ env.pathToCi }}/build.cmd" BuildRepoListing --root "${{ env.pathToCi }}" --list-publish-directory "$GITHUB_WORKSPACE/${{ env.listPublishDirectory }}" --current-package-name "${{ vars.PACKAGE_NAME }}"'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Prepare for GitHub Pages deployment
Expand Down
49 changes: 49 additions & 0 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: The CI workflow on push
on:
push:
branches:
- '*'
- '!main'
permissions:
contents: read
jobs:
build:
runs-on: ubuntu-latest
env:
listPublishDirectory: Website
packagePath: Packages/${{ vars.PACKAGE_NAME }}
pathToCi: ci
unityPackage: ${{ vars.PACKAGE_NAME }}-feature.unitypackage
zipFile: ${{ vars.PACKAGE_NAME }}-feature.zip
steps:
- name: Checkout Local Repository
uses: actions/checkout@v4
- name: Zip the Package for testing
run: zip -r "${{ github.workspace }}/${{ env.zipFile }}" .
working-directory: "${{ env.packagePath }}"
- name: Build a list of .meta files for future use
run: find "${{ env.packagePath }}/" -name '*.meta' -type f >> metaList
- name: Make a UnityPackage version of the Package for release
uses: pCYSl5EDgo/create-unitypackage@v1
with:
package-path: ${{ env.unityPackage }}
include-files: metaList
- name: Checkout Automation Repository without removing prior checkouts
uses: actions/checkout@v4
with:
repository: vrchat-community/package-list-action
path: ${{ env.pathToCi }}
clean: false
- name: Deploy the global.json file
run: cp "${{ github.workspace }}/global.json" "${{ env.pathToCi }}/"
- name: Load cached data from previous runs
uses: actions/cache@v4
with:
path: |
${{ env.pathToCi }}/.nuke/temp
~/.nuget/packages
key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj') }}
- name: Build Package Version Listing with Nuke
run: '"${{ env.pathToCi }}/build.cmd" BuildRepoListing --root "${{ env.pathToCi }}" --list-publish-directory "$GITHUB_WORKSPACE/${{ env.listPublishDirectory }}" --current-package-name "${{ vars.PACKAGE_NAME }}"'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,12 @@ jobs:
echo "stableVersion=${{ steps.stable-match.outputs.match }}" >> $GITHUB_ENV
echo "unityPackage=${{ vars.PACKAGE_NAME }}-${{ steps.version.outputs.value }}.unitypackage" >> $GITHUB_ENV
echo "version=${{ steps.version.outputs.value }}" >> $GITHUB_ENV
echo "zipFile=${{ vars.PACKAGE_NAME }}-${{ steps.version.outputs.value }}".zip >> $GITHUB_ENV
echo "zipFile=${{ vars.PACKAGE_NAME }}-${{ steps.version.outputs.value }}.zip" >> $GITHUB_ENV
- name: Zip the Package for release
working-directory: "${{ env.packagePath }}"
run: zip -r -9 "${{ github.workspace }}/${{ env.zipFile }}" .
- name: Build a list of .meta files for future use
run: find "${{ env.packagePath }}/" -name \*.meta >> metaList
run: find "${{ env.packagePath }}/" -name '*.meta' -type f >> metaList
- name: Make a UnityPackage version of the Package for release
uses: pCYSl5EDgo/create-unitypackage@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
dotnet 6.0.423
dotnet 8.0.403
2 changes: 2 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
"davidanson.vscode-markdownlint",
"editorconfig.editorconfig",
"fernandoescolar.vscode-solution-explorer",
"mariomatheu.syntax-project-pbxproj",
"mrorz.language-gettext",
"redhat.vscode-yaml",
"streetsidesoftware.code-spell-checker",
"visualstudiotoolsforunity.vstuc",
Expand Down
4 changes: 2 additions & 2 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"version": "0.2.0",
"configurations": [
{
"name": "Attach to Unity",
"type": "vstuc",
"request": "attach"
}
]
],
"version": "0.2.0"
}
36 changes: 31 additions & 5 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,13 @@
"explorer.fileNesting.enabled": true,
"explorer.fileNesting.expand": false,
"explorer.fileNesting.patterns": {
"*": "${capture}.meta, ${capture}.md5",
"*": "${capture}.meta, ${capture}.md5, ${capture}-lock",
"*.db": "${capture}.db.st",
"*.dll": "${capture}.pdb",
"*.md": "${capture}.*.md",
"*.png": "${capture}@*.png",
"*.sln": "*.csproj",
"*.xml": "${capture}.dll",
".gitconfig": ".gitattributes, .gitignore",
".markdownlint.*": ".markdownlint-cli2.*",
".tool-versions": "global.json",
Expand All @@ -18,15 +21,16 @@
"*.asmref": "json",
"*.asset": "yaml",
"*.buildreport": "yaml",
"*.config": "xml",
"*.controller": "yaml",
"*.dwlt": "yaml",
"*.info": "json",
"*.exe.config": "xml",
"*.index": "json",
"*.info": "json",
"*.inputactions": "json",
"*.lighting": "yaml",
"*.mat": "yaml",
"*.meta": "yaml",
"*.nuget.cache": "json",
"*.outputdata": "json",
"*.physicmaterial": "yaml",
"*.playable": "yaml",
Expand All @@ -35,16 +39,19 @@
"*.scenetemplate": "yaml",
"*.signal": "yaml",
"*.terrainlayer": "yaml",
"*.tlh": "c",
"*.tlh": "cpp",
"*.traceevents": "jsonl",
"*.unity": "yaml",
"*.uss": "css",
"*.uxml": "xml",
".buginfo": "yaml",
".imgbotconfig": "json",
".settings": "plist",
".signature": "json",
"CodeResources": "xml",
"LastSceneManagerSetup.txt": "yaml",
"LibraryFormatVersion.txt": "yaml",
"LICENSE": "plaintext",
"ProjectCache": "yaml",
"ProjectVersion.txt": "yaml",
"XRPackageSettings.asset": "json",
"XRSettings.asset": "json"
Expand Down Expand Up @@ -89,29 +96,48 @@
"tag:unity3d.com,2011:30 mapping",
"tag:unity3d.com,2011:33 mapping",
"tag:unity3d.com,2011:47 mapping",
"tag:unity3d.com,2011:54 mapping",
"tag:unity3d.com,2011:55 mapping",
"tag:unity3d.com,2011:60 mapping",
"tag:unity3d.com,2011:64 mapping",
"tag:unity3d.com,2011:65 mapping",
"tag:unity3d.com,2011:74 mapping",
"tag:unity3d.com,2011:78 mapping",
"tag:unity3d.com,2011:81 mapping",
"tag:unity3d.com,2011:82 mapping",
"tag:unity3d.com,2011:84 mapping",
"tag:unity3d.com,2011:91 mapping",
"tag:unity3d.com,2011:92 mapping",
"tag:unity3d.com,2011:95 mapping",
"tag:unity3d.com,2011:102 mapping",
"tag:unity3d.com,2011:104 mapping",
"tag:unity3d.com,2011:108 mapping",
"tag:unity3d.com,2011:114 mapping",
"tag:unity3d.com,2011:124 mapping",
"tag:unity3d.com,2011:126 mapping",
"tag:unity3d.com,2011:129 mapping",
"tag:unity3d.com,2011:134 mapping",
"tag:unity3d.com,2011:135 mapping",
"tag:unity3d.com,2011:136 mapping",
"tag:unity3d.com,2011:137 mapping",
"tag:unity3d.com,2011:143 mapping",
"tag:unity3d.com,2011:154 mapping",
"tag:unity3d.com,2011:157 mapping",
"tag:unity3d.com,2011:159 mapping",
"tag:unity3d.com,2011:162 mapping",
"tag:unity3d.com,2011:195 mapping",
"tag:unity3d.com,2011:196 mapping",
"tag:unity3d.com,2011:198 mapping",
"tag:unity3d.com,2011:199 mapping",
"tag:unity3d.com,2011:206 mapping",
"tag:unity3d.com,2011:212 mapping",
"tag:unity3d.com,2011:218 mapping",
"tag:unity3d.com,2011:222 mapping",
"tag:unity3d.com,2011:223 mapping",
"tag:unity3d.com,2011:224 mapping",
"tag:unity3d.com,2011:236 mapping",
"tag:unity3d.com,2011:310 mapping",
"tag:unity3d.com,2011:320 mapping",
"tag:unity3d.com,2011:1001 mapping",
"tag:unity3d.com,2011:1002 mapping",
"tag:unity3d.com,2011:1045 mapping",
Expand Down
18 changes: 17 additions & 1 deletion Assets/XR/XRGeneralSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,22 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_LoaderManagerInstance: {fileID: -2246711676068384422}
m_InitManagerOnStart: 0
--- !u!114 &-5640301455614997853
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4c3631f5e58749a59194e0cf6baf6d5, type: 3}
m_Name: iPhone Providers
m_EditorClassIdentifier:
m_RequiresSettingsUpdate: 0
m_AutomaticLoading: 0
m_AutomaticRunning: 0
m_Loaders: []
--- !u!114 &-4566681384425441232
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -26,7 +42,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d236b7d11115f2143951f1e14045df39, type: 3}
m_Name: iPhone Settings
m_EditorClassIdentifier:
m_LoaderManagerInstance: {fileID: 0}
m_LoaderManagerInstance: {fileID: -5640301455614997853}
m_InitManagerOnStart: 0
--- !u!114 &-2882982675917644281
MonoBehaviour:
Expand Down
12 changes: 6 additions & 6 deletions Packages/.gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*/
!com.vrchat.core.*

# Change this to match your new package name
!black.kit.vrcui
!com.vrchat.core.*/
/*/
!com.vrchat.core.*

# Change this to match your new package name
!black.kit.vrcui
!com.vrchat.core.*/
8 changes: 4 additions & 4 deletions Packages/black.kit.vrcui/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "black.kit.vrcui",
"displayName": "black.kit.vrcui",
"version": "0.5.1",
"version": "0.5.2",
"unity": "2022.3",
"unityRelease": "22f1",
"description": "Unofficial uGUI theme like the LaunchPad for VRChat worlds. / 非公式のVRChat 風 uGUI スキン",
Expand All @@ -24,8 +24,8 @@
"dependencies": {},
"gitDependencies": {},
"vpmDependencies": {
"black.kit.launchpadicons": "^0.6.0",
"black.kit.toybox": "^0.8.0",
"com.vrchat.worlds": "^3.6.1"
"black.kit.launchpadicons": "^0.6.2",
"black.kit.toybox": "^0.8.1",
"com.vrchat.worlds": "^3.7.1"
}
}
3 changes: 2 additions & 1 deletion Packages/packages-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,8 @@
"com.unity.cinemachine": "2.9.7",
"com.unity.textmeshpro": "3.0.6",
"com.unity.inputsystem": "1.2.0",
"com.unity.ai.navigation": "1.1.5"
"com.unity.ai.navigation": "1.1.5",
"com.unity.ugui": "1.0.0"
}
},
"dev.onevr.vrworldtoolkit": {
Expand Down
35 changes: 16 additions & 19 deletions Packages/vpm-manifest.json
Original file line number Diff line number Diff line change
@@ -1,51 +1,48 @@
{
"dependencies": {
"dev.onevr.vrworldtoolkit": {
"version": "3.1.0"
},
"com.vrchat.core.vpm-resolver": {
"version": "0.1.29"
},
"com.vrchat.base": {
"version": "3.6.1"
"dev.onevr.vrworldtoolkit": {
"version": "3.2.0"
},
"com.vrchat.worlds": {
"version": "3.6.1"
"version": "3.7.1"
},
"black.kit.launchpadicons": {
"version": "0.6.0"
"version": "0.6.2"
},
"black.kit.toybox": {
"version": "0.8.0"
"version": "0.8.1"
}
},
"locked": {
"dev.onevr.vrworldtoolkit": {
"version": "3.1.0",
"dependencies": {}
},
"com.vrchat.core.vpm-resolver": {
"version": "0.1.29",
"dependencies": {}
},
"com.vrchat.base": {
"version": "3.6.1",
"dev.onevr.vrworldtoolkit": {
"version": "3.2.0",
"dependencies": {}
},
"com.vrchat.worlds": {
"version": "3.6.1",
"version": "3.7.1",
"dependencies": {
"com.vrchat.base": "3.6.1"
"com.vrchat.base": "3.7.1"
}
},
"com.vrchat.base": {
"version": "3.7.1",
"dependencies": {}
},
"black.kit.launchpadicons": {
"version": "0.6.0",
"version": "0.6.2",
"dependencies": {}
},
"black.kit.toybox": {
"version": "0.8.0",
"version": "0.8.1",
"dependencies": {
"com.vrchat.worlds": "^3.6.1"
"com.vrchat.worlds": "^3.7.1"
}
}
}
Expand Down
Loading

0 comments on commit 17061f3

Please sign in to comment.