Merge branch 'master' into mkitti-refactor-binaryplatforms-compat-wit…

…h-types

.github/workflows/test.yml

@@ -26,20 +26,34 @@ jobs:
       matrix:
         os:
           - ubuntu-latest
-          - macOS-latest
+          - macOS-14 # arm
           - windows-latest
         julia-arch:
           - 'x64'
           - 'x86'
+          - 'aarch64'
         pkg-server:
-          - ""
-          - "pkg.julialang.org"
+          - "pkg.julialang.org" # Default to this for all except specific cases
         julia-version:
-          # - '1.6'
           - 'nightly'
         exclude:
-          - os: macOS-latest
+          - os: ubuntu-latest
+            julia-arch: aarch64
+          - os: windows-latest
+            julia-arch: aarch64
+          - os: macOS-14
             julia-arch: x86
+          - os: macOS-14
+            julia-arch: x64
+        include:
+          - os: ubuntu-latest
+            julia-arch: 'x64'
+            julia-version: 'nightly'
+            pkg-server: ""
+          - os: ubuntu-latest
+            julia-arch: 'x64'
+            julia-version: 'nightly'
+            pkg-server: "pkg.julialang.org"
     steps:
       - name: Set git to use LF and fix TEMP on windows
         if: matrix.os == 'windows-latest'

Project.toml

@@ -15,7 +15,6 @@ Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
 Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
 Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a"
 Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
-REPL = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 SHA = "ea8e919c-243c-51af-8825-aaa63cd721ce"
 Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
@@ -24,6 +23,12 @@ Tar = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e"
 UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
 p7zip_jll = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0"
 
+[weakdeps]
+REPL = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
+
+[extensions]
+REPLExt = "REPL"
+
 [compat]
 HistoricalStdlibVersions = "1.2"
 
@@ -33,4 +38,4 @@ Preferences = "21216c6a-2e73-6563-6e65-726566657250"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["Test", "Preferences", "HistoricalStdlibVersions"]
+test = ["REPL", "Test", "Preferences", "HistoricalStdlibVersions"]

docs/src/getting-started.md

@@ -134,7 +134,7 @@ We can ask for information about the active environment by using `status`:
 ```
 
 `~/tutorial/Project.toml` is the location of the active environment's **project file**.
-A project file is a [TOML](https://toml.io/en/) file here Pkg stores the packages that have been explicitly installed.
+A project file is a [TOML](https://toml.io/en/) file where Pkg stores the packages that have been explicitly installed.
 Notice this new environment is empty.
 Let us add some packages and observe:
 

docs/src/managing-packages.md

@@ -28,7 +28,7 @@ Precompiling environment...
   2 dependencies successfully precompiled in 2 seconds
 ```
 
-Here we added the package Example to the current environment (which is the default `@v1.8` environment).
+Here we added the package `JSON` to the current environment (which is the default `@v1.8` environment).
 In this example, we are using a fresh Julia installation,
 and this is our first time adding a package using Pkg. By default, Pkg installs the General registry
 and uses this registry to look up packages requested for inclusion in the current environment.
@@ -203,7 +203,7 @@ from that local repo are pulled when packages are updated.
 
 !!! warning
     Note that tracking a package through `add` is distinct from
-    `develop` (which is described in the next session). When using `add` on a local
+    `develop` (which is described in the next section). When using `add` on a local
     git repository, changes to files in the local package repository will not
     immediately be reflected when loading that package. The changes would have to be
     committed and the packages updated in order to pull in the changes. In the
@@ -473,7 +473,7 @@ Indeed, `A`'s requirements are such that we need `v0.2.0` of `C`.
          └─restricted to versions * by an explicit requirement, leaving only versions 1.0.0
 ```
 
-So we can see that `A` was `explicitly required, and in this case, it's because we were trying to
+So we can see that `A` was explicitly required, and in this case, it's because we were trying to
 `add` it to our environment.
 
 In summary, we explicitly asked to use `A` and `B`, but this gave a conflict for `D`.

docs/src/toml-files.md

@@ -128,6 +128,17 @@ For the details, see [`Pkg.instantiate`](@ref).
     The `Manifest.toml` file is generated and maintained by Pkg and, in general, this file
     should *never* be modified manually.
 
+### Different Manifests for Different Julia versions
+
+Starting from Julia v1.11, there is an option to name manifest files in the format `Manifest-v{major}.{minor}.toml`.
+Julia will then preferentially use the version-specific manifest file if available.
+For example, if both `Manifest-v1.11.toml` and `Manifest.toml` exist, Julia 1.11 will prioritize using `Manifest-v1.11.toml`.
+However, Julia versions 1.10, 1.12, and all others will default to using `Manifest.toml`.
+This feature allows for easier management of different instantiated versions of dependencies for various Julia versions.
+Note that there can only be one `Project.toml` file. While `Manifest-v{major}.{minor}.toml` files are not automatically 
+created by Pkg, users can manually rename a `Manifest.toml` file to match
+the versioned format, and Pkg will subsequently maintain it through its operations.
+
 
 ### `Manifest.toml` entries