Original PR: https://github.com/apple/pkl/pull/486 Author: @bioball Created: 5/10/2024 Status: ✅ Merged Merged: 6/5/2024 Merged by: @bioball
Base: main ← Head: projects-from-any-uri
main
projects-from-any-uri
4a63fb8
ed52fe3
fc200fa
0258094
49 files changed (+763 additions, -234 deletions)
📝 pkl-core/src/main/java/org/pkl/core/EvaluatorImpl.java (+2 -1) 📝 pkl-core/src/main/java/org/pkl/core/ast/builder/AstBuilder.java (+2 -0) 📝 pkl-core/src/main/java/org/pkl/core/ast/expression/unary/ReadGlobNode.java (+4 -2) 📝 pkl-core/src/main/java/org/pkl/core/module/ModuleKeys.java (+83 -108) 📝 pkl-core/src/main/java/org/pkl/core/module/ProjectDependenciesManager.java (+43 -21) 📝 pkl-core/src/main/java/org/pkl/core/module/ResolvedModuleKeys.java (+34 -0) 📝 pkl-core/src/main/java/org/pkl/core/packages/Dependency.java (+4 -2) 📝 pkl-core/src/main/java/org/pkl/core/project/Project.java (+84 -23) 📝 pkl-core/src/main/java/org/pkl/core/project/ProjectPackager.java (+10 -1) 📝 pkl-core/src/main/java/org/pkl/core/repl/ReplServer.java (+3 -1) 📝 pkl-core/src/main/java/org/pkl/core/resource/ResourceReaders.java (+25 -14) 📝 pkl-core/src/main/java/org/pkl/core/runtime/ResourceManager.java (+22 -7) 📝 pkl-core/src/main/java/org/pkl/core/runtime/VmExceptionBuilder.java (+1 -1) 📝 pkl-core/src/main/java/org/pkl/core/util/GlobResolver.java (+9 -1) 📝 pkl-core/src/main/java/org/pkl/core/util/IoUtils.java (+68 -17) 📝 pkl-core/src/main/resources/org/pkl/core/errorMessages.properties (+32 -3) 📝 pkl-core/src/test/files/LanguageSnippetTests/input/projects/project1/PklProject (+1 -0) 📝 pkl-core/src/test/files/LanguageSnippetTests/input/projects/project1/PklProject.deps.json (+5 -0) 📝 pkl-core/src/test/files/LanguageSnippetTests/input/projects/project1/globbing.pkl (+4 -0) 📝 pkl-core/src/test/files/LanguageSnippetTests/input/projects/project3/PklProject.deps.json (+5 -0)
pkl-core/src/main/java/org/pkl/core/EvaluatorImpl.java
pkl-core/src/main/java/org/pkl/core/ast/builder/AstBuilder.java
pkl-core/src/main/java/org/pkl/core/ast/expression/unary/ReadGlobNode.java
pkl-core/src/main/java/org/pkl/core/module/ModuleKeys.java
pkl-core/src/main/java/org/pkl/core/module/ProjectDependenciesManager.java
pkl-core/src/main/java/org/pkl/core/module/ResolvedModuleKeys.java
pkl-core/src/main/java/org/pkl/core/packages/Dependency.java
pkl-core/src/main/java/org/pkl/core/project/Project.java
pkl-core/src/main/java/org/pkl/core/project/ProjectPackager.java
pkl-core/src/main/java/org/pkl/core/repl/ReplServer.java
pkl-core/src/main/java/org/pkl/core/resource/ResourceReaders.java
pkl-core/src/main/java/org/pkl/core/runtime/ResourceManager.java
pkl-core/src/main/java/org/pkl/core/runtime/VmExceptionBuilder.java
pkl-core/src/main/java/org/pkl/core/util/GlobResolver.java
pkl-core/src/main/java/org/pkl/core/util/IoUtils.java
pkl-core/src/main/resources/org/pkl/core/errorMessages.properties
pkl-core/src/test/files/LanguageSnippetTests/input/projects/project1/PklProject
pkl-core/src/test/files/LanguageSnippetTests/input/projects/project1/PklProject.deps.json
pkl-core/src/test/files/LanguageSnippetTests/input/projects/project1/globbing.pkl
pkl-core/src/test/files/LanguageSnippetTests/input/projects/project3/PklProject.deps.json
...and 29 more files
Supercedes and closes #255
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.
No dependencies set.
The note is not visible to the blocked user.
📋 Pull Request Information
Original PR: https://github.com/apple/pkl/pull/486
Author: @bioball
Created: 5/10/2024
Status: ✅ Merged
Merged: 6/5/2024
Merged by: @bioball
Base:
main← Head:projects-from-any-uri📝 Commits (4)
4a63fb8Support Projects loaded from arbitrary URIsed52fe3Adjustments in accordance with SPICE-0005fc200faAddress PR comments0258094Clean up merge conflict issues📊 Changes
49 files changed (+763 additions, -234 deletions)
View changed files
📝
pkl-core/src/main/java/org/pkl/core/EvaluatorImpl.java(+2 -1)📝
pkl-core/src/main/java/org/pkl/core/ast/builder/AstBuilder.java(+2 -0)📝
pkl-core/src/main/java/org/pkl/core/ast/expression/unary/ReadGlobNode.java(+4 -2)📝
pkl-core/src/main/java/org/pkl/core/module/ModuleKeys.java(+83 -108)📝
pkl-core/src/main/java/org/pkl/core/module/ProjectDependenciesManager.java(+43 -21)📝
pkl-core/src/main/java/org/pkl/core/module/ResolvedModuleKeys.java(+34 -0)📝
pkl-core/src/main/java/org/pkl/core/packages/Dependency.java(+4 -2)📝
pkl-core/src/main/java/org/pkl/core/project/Project.java(+84 -23)📝
pkl-core/src/main/java/org/pkl/core/project/ProjectPackager.java(+10 -1)📝
pkl-core/src/main/java/org/pkl/core/repl/ReplServer.java(+3 -1)📝
pkl-core/src/main/java/org/pkl/core/resource/ResourceReaders.java(+25 -14)📝
pkl-core/src/main/java/org/pkl/core/runtime/ResourceManager.java(+22 -7)📝
pkl-core/src/main/java/org/pkl/core/runtime/VmExceptionBuilder.java(+1 -1)📝
pkl-core/src/main/java/org/pkl/core/util/GlobResolver.java(+9 -1)📝
pkl-core/src/main/java/org/pkl/core/util/IoUtils.java(+68 -17)📝
pkl-core/src/main/resources/org/pkl/core/errorMessages.properties(+32 -3)📝
pkl-core/src/test/files/LanguageSnippetTests/input/projects/project1/PklProject(+1 -0)📝
pkl-core/src/test/files/LanguageSnippetTests/input/projects/project1/PklProject.deps.json(+5 -0)📝
pkl-core/src/test/files/LanguageSnippetTests/input/projects/project1/globbing.pkl(+4 -0)📝
pkl-core/src/test/files/LanguageSnippetTests/input/projects/project3/PklProject.deps.json(+5 -0)...and 29 more files
📄 Description
Supercedes and closes #255
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.