forked from apple/pkl-pantry
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Use local dependencies whenever possible
This is a workaround for two issues: * apple/pkl-intellij#23 * apple/pkl#414
- Loading branch information
The Pkl Team (automation)
committed
Apr 9, 2024
1 parent
925c718
commit 472a016
Showing
4 changed files
with
22 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,15 +22,12 @@ dependencies { | |
| ["jsonschema"] = import("../org.json_schema/PklProject") | ||
| ["jsonschema.contrib"] = import("../org.json_schema.contrib/PklProject") | ||
| ["deepToTyped"] = import("../pkl.experimental.deepToTyped/PklProject") | ||
| ["uri"] = import("../pkl.experimental.uri/PklProject") | ||
| ["syntax"] = import("../pkl.experimental.syntax/PklProject") | ||
|
|
||
| ["k8s"] { uri = "package://pkg.pkl-lang.org/pkl-k8s/[email protected]" } | ||
|
|
||
| // intentionally a remote dependency to reduce churn. Otherwise any changes to pkl.experimental.* will require | ||
| // version bumps here. | ||
| ["uri"] { uri = "package://pkg.pkl-lang.org/pkl-pantry/[email protected]" } | ||
| ["syntax"] { uri = "package://pkg.pkl-lang.org/pkl-pantry/[email protected]" } | ||
| } | ||
|
|
||
| package { | ||
| version = "1.0.2" | ||
| version = "1.0.3" | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,30 +8,26 @@ | |
| "sha256": "75c6d66d94c335417a3c502e107aaeadf7a60b4e1d34b2c979afe11193205a1a" | ||
| } | ||
| }, | ||
| "package://pkg.pkl-lang.org/pkl-pantry/pkl.experimental.syntax@1": { | ||
| "type": "remote", | ||
| "uri": "projectpackage://pkg.pkl-lang.org/pkl-pantry/[email protected]", | ||
| "checksums": { | ||
| "sha256": "7165ecc043a6010ec1e415ef767a25726e8fde434bc3caa007367f8cac1145d6" | ||
| } | ||
| }, | ||
| "package://pkg.pkl-lang.org/pkl-pantry/pkl.experimental.uri@1": { | ||
| "type": "remote", | ||
| "uri": "projectpackage://pkg.pkl-lang.org/pkl-pantry/[email protected]", | ||
| "checksums": { | ||
| "sha256": "12a42da6a2933a802cc79cea7f5541513b5106070ca5f1236009ebefeb3d81b3" | ||
| } | ||
| }, | ||
| "package://pkg.pkl-lang.org/pkl-pantry/pkl.experimental.deepToTyped@1": { | ||
| "type": "local", | ||
| "uri": "projectpackage://pkg.pkl-lang.org/pkl-pantry/[email protected]", | ||
| "path": "../pkl.experimental.deepToTyped" | ||
| }, | ||
| "package://pkg.pkl-lang.org/pkl-pantry/org.json_schema.contrib@1": { | ||
| "type": "local", | ||
| "uri": "projectpackage://pkg.pkl-lang.org/pkl-pantry/[email protected].3", | ||
| "uri": "projectpackage://pkg.pkl-lang.org/pkl-pantry/[email protected].4", | ||
| "path": "../org.json_schema.contrib" | ||
| }, | ||
| "package://pkg.pkl-lang.org/pkl-pantry/pkl.experimental.syntax@1": { | ||
| "type": "local", | ||
| "uri": "projectpackage://pkg.pkl-lang.org/pkl-pantry/[email protected]", | ||
| "path": "../pkl.experimental.syntax" | ||
| }, | ||
| "package://pkg.pkl-lang.org/pkl-pantry/pkl.experimental.uri@1": { | ||
| "type": "local", | ||
| "uri": "projectpackage://pkg.pkl-lang.org/pkl-pantry/[email protected]", | ||
| "path": "../pkl.experimental.uri" | ||
| }, | ||
| "package://pkg.pkl-lang.org/pkl-pantry/org.json_schema@1": { | ||
| "type": "local", | ||
| "uri": "projectpackage://pkg.pkl-lang.org/pkl-pantry/[email protected]", | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,12 +20,10 @@ amends "../basePklProject.pkl" | |
|
|
||
| dependencies { | ||
| ["jsonschema"] = import("../org.json_schema/PklProject") | ||
| // intentionally a remote dependency to reduce churn. Otherwise any changes to pkl.experimental.* will require | ||
| // version bumps here. | ||
| ["uri"] { uri = "package://pkg.pkl-lang.org/pkl-pantry/[email protected]" } | ||
| ["syntax"] { uri = "package://pkg.pkl-lang.org/pkl-pantry/[email protected]" } | ||
| ["uri"] = import("../pkl.experimental.uri/PklProject") | ||
| ["syntax"] = import("../pkl.experimental.syntax/PklProject") | ||
| } | ||
|
|
||
| package { | ||
| version = "1.0.3" | ||
| version = "1.0.4" | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,18 +2,14 @@ | |
| "schemaVersion": 1, | ||
| "resolvedDependencies": { | ||
| "package://pkg.pkl-lang.org/pkl-pantry/pkl.experimental.syntax@1": { | ||
| "type": "remote", | ||
| "uri": "projectpackage://pkg.pkl-lang.org/pkl-pantry/[email protected]", | ||
| "checksums": { | ||
| "sha256": "7165ecc043a6010ec1e415ef767a25726e8fde434bc3caa007367f8cac1145d6" | ||
| } | ||
| "type": "local", | ||
| "uri": "projectpackage://pkg.pkl-lang.org/pkl-pantry/[email protected]", | ||
| "path": "../pkl.experimental.syntax" | ||
| }, | ||
| "package://pkg.pkl-lang.org/pkl-pantry/pkl.experimental.uri@1": { | ||
| "type": "remote", | ||
| "type": "local", | ||
| "uri": "projectpackage://pkg.pkl-lang.org/pkl-pantry/[email protected]", | ||
| "checksums": { | ||
| "sha256": "12a42da6a2933a802cc79cea7f5541513b5106070ca5f1236009ebefeb3d81b3" | ||
| } | ||
| "path": "../pkl.experimental.uri" | ||
| }, | ||
| "package://pkg.pkl-lang.org/pkl-pantry/org.json_schema@1": { | ||
| "type": "local", | ||
|
|
||