mirror of
https://abf.rosa.ru/djam/sbt.git
synced 2025-02-23 09:52:46 +00:00
92 lines
4.6 KiB
Diff
92 lines
4.6 KiB
Diff
From 8c6bddc7296652f0734c70a5f237c488fb5d8798 Mon Sep 17 00:00:00 2001
|
|
From: William Benton <willb@redhat.com>
|
|
Date: Fri, 13 Dec 2013 12:51:59 -0600
|
|
Subject: [PATCH 2/2] Update documentation references to Ivy 2.3.0
|
|
|
|
---
|
|
src/sphinx/Detailed-Topics/Artifacts.rst | 2 +-
|
|
src/sphinx/Detailed-Topics/Library-Management.rst | 8 ++++----
|
|
src/sphinx/Detailed-Topics/Publishing.rst | 2 +-
|
|
src/sphinx/Getting-Started/Library-Dependencies.rst | 2 +-
|
|
4 files changed, 7 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/src/sphinx/Detailed-Topics/Artifacts.rst b/src/sphinx/Detailed-Topics/Artifacts.rst
|
|
index 845c7e1..b6d9e45 100644
|
|
--- a/src/sphinx/Detailed-Topics/Artifacts.rst
|
|
+++ b/src/sphinx/Detailed-Topics/Artifacts.rst
|
|
@@ -128,7 +128,7 @@ For example:
|
|
Artifact("myproject", "jdk15")
|
|
|
|
See the `Ivy
|
|
-documentation <http://ant.apache.org/ivy/history/2.3.0-rc1/ivyfile/dependency-artifact.html>`_
|
|
+documentation <http://ant.apache.org/ivy/history/2.3.0/ivyfile/dependency-artifact.html>`_
|
|
for more details on artifacts. See the `Artifact
|
|
API <../../api/sbt/Artifact$.html>`_ for
|
|
combining the parameters above and specifying [Configurations] and extra
|
|
diff --git a/src/sphinx/Detailed-Topics/Library-Management.rst b/src/sphinx/Detailed-Topics/Library-Management.rst
|
|
index 8dc2e9c..a01a514 100644
|
|
--- a/src/sphinx/Detailed-Topics/Library-Management.rst
|
|
+++ b/src/sphinx/Detailed-Topics/Library-Management.rst
|
|
@@ -124,7 +124,7 @@ the version of Scala you are using. See :doc:`Cross-Build` for details.
|
|
Ivy can select the latest revision of a module according to constraints
|
|
you specify. Instead of a fixed revision like `"1.6.1"`, you specify
|
|
`"latest.integration"`, `"2.9.+"`, or `"[1.0,)"`. See the `Ivy
|
|
-revisions <http://ant.apache.org/ivy/history/2.3.0-rc1/ivyfile/dependency.html#revision>`_
|
|
+revisions <http://ant.apache.org/ivy/history/2.3.0/ivyfile/dependency.html#revision>`_
|
|
documentation for details.
|
|
|
|
Resolvers
|
|
@@ -320,7 +320,7 @@ Extra Attributes
|
|
~~~~~~~~~~~~~~~~
|
|
|
|
`Extra
|
|
-attributes <http://ant.apache.org/ivy/history/2.3.0-rc1/concept.html#extra>`_
|
|
+attributes <http://ant.apache.org/ivy/history/2.3.0/concept.html#extra>`_
|
|
can be specified by passing key/value pairs to the `extra` method.
|
|
|
|
To select dependencies by extra attributes:
|
|
@@ -527,7 +527,7 @@ Configurations
|
|
Ivy configurations are a useful feature for your build when you need
|
|
custom groups of dependencies, such as for a plugin. Ivy configurations
|
|
are essentially named sets of dependencies. You can read the
|
|
-`Ivy documentation <http://ant.apache.org/ivy/history/2.3.0-rc1/tutorial/conf.html>`_
|
|
+`Ivy documentation <http://ant.apache.org/ivy/history/2.3.0/tutorial/conf.html>`_
|
|
for details.
|
|
|
|
The built-in use of configurations in sbt is similar to scopes in Maven.
|
|
@@ -549,7 +549,7 @@ your dependency definition:
|
|
|
|
This says that your project's `"test"` configuration uses
|
|
`ScalaTest`'s `"compile"` configuration. See the `Ivy
|
|
-documentation <http://ant.apache.org/ivy/history/2.3.0-rc1/tutorial/conf.html>`_
|
|
+documentation <http://ant.apache.org/ivy/history/2.3.0/tutorial/conf.html>`_
|
|
for more advanced mappings. Most projects published to Maven
|
|
repositories will use the `"compile"` configuration.
|
|
|
|
diff --git a/src/sphinx/Detailed-Topics/Publishing.rst b/src/sphinx/Detailed-Topics/Publishing.rst
|
|
index 67dc2bb..ea5d7a2 100644
|
|
--- a/src/sphinx/Detailed-Topics/Publishing.rst
|
|
+++ b/src/sphinx/Detailed-Topics/Publishing.rst
|
|
@@ -163,5 +163,5 @@ change the version number each time you publish. Ivy maintains a cache,
|
|
and it stores even local projects in that cache. If Ivy already has a
|
|
version cached, it will not check the local repository for updates,
|
|
unless the version number matches a `changing
|
|
-pattern <http://ant.apache.org/ivy/history/2.3.0-rc1/concept.html#change>`_,
|
|
+pattern <http://ant.apache.org/ivy/history/2.3.0/concept.html#change>`_,
|
|
and `SNAPSHOT` is one such pattern.
|
|
diff --git a/src/sphinx/Getting-Started/Library-Dependencies.rst b/src/sphinx/Getting-Started/Library-Dependencies.rst
|
|
index 536fe8a..08f84ab 100644
|
|
--- a/src/sphinx/Getting-Started/Library-Dependencies.rst
|
|
+++ b/src/sphinx/Getting-Started/Library-Dependencies.rst
|
|
@@ -155,7 +155,7 @@ be a single fixed version. Ivy can select the latest revision of a
|
|
module according to constraints you specify. Instead of a fixed revision
|
|
like `"1.6.1"`, you specify `"latest.integration"`, `"2.9.+"`, or
|
|
`"[1.0,)"`. See the `Ivy
|
|
-revisions <http://ant.apache.org/ivy/history/2.3.0-rc1/ivyfile/dependency.html#revision>`_
|
|
+revisions <http://ant.apache.org/ivy/history/2.3.0/ivyfile/dependency.html#revision>`_
|
|
documentation for details.
|
|
|
|
Resolvers
|
|
--
|
|
1.8.3.4 (Apple Git-47)
|
|
|