Skip to content

Commit

Permalink
Bump SwiftUSD.
Browse files Browse the repository at this point in the history
  • Loading branch information
furby-tm committed Mar 15, 2024
1 parent 8bbc6d9 commit eb2218d
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Kraken.usda
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#usda 1.0
(
doc = "Kraken v1.0.6"
doc = "Kraken v1.0.7"
)

def Xform "Hello"
Expand Down
8 changes: 4 additions & 4 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/wabiverse/MetaverseKit.git",
"state" : {
"revision" : "c826dd68f0dc8f7b0e5aa5e5045d7203ab6c1df7",
"version" : "1.5.2"
"revision" : "f11bfddb41c944264a5d18af37b1b95e2c4931ca",
"version" : "1.5.8"
}
},
{
Expand Down Expand Up @@ -212,8 +212,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/wabiverse/SwiftUSD.git",
"state" : {
"revision" : "277133fc04e589ef70aa59d3749d5ea2195f55ae",
"version" : "23.11.27"
"revision" : "1cb37da37dd88a7758473ebc9e06173351e3de08",
"version" : "23.11.31"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ let package = Package(

// --- 🦄 Package Dependencies. ---
dependencies: [
.package(url: "https://github.com/wabiverse/SwiftUSD.git", from: "23.11.27"),
.package(url: "https://github.com/wabiverse/SwiftUSD.git", from: "23.11.31"),
.package(url: "https://github.com/apple/swift-llbuild.git", revision: "bc3ffd5"),
.package(url: "https://github.com/furby-tm/swift-bundler", from: "2.0.9"),
] + Arch.OS.pkgDeps(),
Expand Down
2 changes: 1 addition & 1 deletion Sources/Kraken/Creator.swift
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import SwiftUI
@main
struct Kraken: App
{
static let version = Pixar.GfVec3i(1, 0, 6)
static let version = Pixar.GfVec3i(1, 0, 7)

init()
{
Expand Down
18 changes: 18 additions & 0 deletions build_files/build_environment/KrakenDeveloperProfile.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ $IsGitDirectory = './.git'
if ($IsMacOS) {
$ARM_HOMEBREW_PATH = "/opt/homebrew/bin"
$SWIFT_SH_BUILD_PATH = "/usr/local/bin"
$RUST_CARGO_BINPATH = "/Users/$env:USER/.cargo/bin"
$POSTGRES_APP_PATH = "/Applications/Postgres.app/Contents/Versions/latest/bin"
$XCODE_TOOLCHAIN_BINPATH = "/Applications/Xcode-beta.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin"

# Apple Silicon (M1 Chip ---- /opt/homebrew/bin)
if (Test-Path -Path $ARM_HOMEBREW_PATH) {
Expand All @@ -34,6 +37,21 @@ if ($IsMacOS) {
if (Test-Path -Path $SWIFT_SH_BUILD_PATH) {
$env:PATH = '{0}{1}{2}' -f $env:PATH,[IO.Path]::PathSeparator,$SWIFT_SH_BUILD_PATH
}

# swift sourcekit-lsp
if (Test-Path -Path $XCODE_TOOLCHAIN_BINPATH) {
$env:PATH = '{0}{1}{2}' -f $env:PATH,[IO.Path]::PathSeparator,$XCODE_TOOLCHAIN_BINPATH
}

# rust cargo
if (Test-Path -Path $RUST_CARGO_BINPATH) {
$env:PATH = '{0}{1}{2}' -f $env:PATH,[IO.Path]::PathSeparator,$RUST_CARGO_BINPATH
}

# postgres
if (Test-Path -Path $POSTGRES_APP_PATH) {
$env:PATH = '{0}{1}{2}' -f $env:PATH,[IO.Path]::PathSeparator,$POSTGRES_APP_PATH
}
}

# --------------------------------------- Powershell modules. -----
Expand Down
7 changes: 5 additions & 2 deletions build_files/build_environment/krakentheme.omp.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,16 @@
{
"foreground": "magenta",
"style": "powerline",
"template": "<darkGray>on</> <blue>\uf113</> <green>git</><cyan>:</>{{ .HEAD }} {{ .BranchStatus }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Staging.Changed) (.Working.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0}} \uf692 {{ .StashCount }}{{ end }}{{ if gt .WorktreeCount 0}} \uf1bb {{ .WorktreeCount }}{{ end }}",
"template": "<darkGray>on</> <blue>\udb80\udea4</> <green>git</><cyan>:</>{{ .HEAD }} {{ .BranchStatus }}{{ if .Working.Changed }}\udb83\udec3 {{ .Working.String }}{{ end }}{{ if and (.Staging.Changed) (.Working.Changed) }} |{{ end }}{{ if .Staging.Changed }}\udb80\udd33 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0}}\udb80\udd93 {{ .StashCount }}{{ end }}{{ if gt .WorktreeCount 0}}\udb81\ude45 {{ .WorktreeCount }}{{ end }}",
"type": "git"
},
{
"properties": {
"time_format": "3:04PM"
},
"foreground": "darkGray",
"style": "plain",
"template": "[{{ .CurrentDate | date .Format }}]",
"template": " [{{ .CurrentDate | date .Format }}]",
"type": "time"
},
{
Expand Down

0 comments on commit eb2218d

Please sign in to comment.