Permalink
Browse files

Set Slick Extensions version in the manual independent of Slick version

Conflicts:
	project/Build.scala
	slick/src/sphinx/index.rst
  • Loading branch information...
szeiger committed Aug 17, 2015
1 parent 3dfa52e commit 34bf73f50251cfabb224562b7a2e769cb44c6772
Showing with 15 additions and 4 deletions.
  1. +3 −1 project/Build.scala
  2. +10 −1 slick/src/sphinx/conf.py
  3. +1 −1 slick/src/sphinx/extensions.rst
  4. +1 −1 slick/src/sphinx/index.rst
View
@@ -14,6 +14,7 @@ import de.johoop.testngplugin.TestNGPlugin._
object SlickBuild extends Build {
val slickVersion = "3.1.0-SNAPSHOT"
val slickExtensionsVersion = slickVersion // Slick extensions version for links in the manual
val binaryCompatSlickVersion = "3.1.0" // Slick base version for binary compatibility checks
val scalaVersions = Seq("2.10.5", "2.11.6")
@@ -194,7 +195,8 @@ object SlickBuild extends Build {
)),
(sphinxEnv in Sphinx) := (sphinxEnv in Sphinx).value +
("version" -> version.value.replaceFirst("""(\d*.\d*).*""", """$1""")) +
("release" -> version.value),
("release" -> version.value) +
("slick_extensions_version" -> slickExtensionsVersion),
(sphinxProperties in Sphinx) := Map.empty,
makeSite <<= makeSite dependsOn (buildCapabilitiesTable in slickTestkitProject),
site.addMappingsToSiteDir(mappings in packageDoc in Compile in slickProject, "api"),
View
@@ -246,6 +246,11 @@
slick_template_suffix = '-'+version
scala_version = '2.10.0'
slick_extensions_version = os.environ["slick_extensions_version"]
if slick_extensions_version == release:
slick_extensions_api_path = 'extensions-api'
else:
slick_extensions_api_path = '../'+slick_extensions_version+'/extensions-api'
# e.g. :issue:`36` :ticket:`8`
extlinks = {
@@ -269,6 +274,10 @@
.. _Slick Plain SQL Queries template: https://typesafe.com/activator/template/slick-plainsql%(template-suffix)s
.. _Slick Multi-DB Patterns template: http://typesafe.com/activator/template/slick-multidb%(template-suffix)s
.. _Slick TestKit Example template: https://typesafe.com/activator/template/slick-testkit-example%(template-suffix)s
.. _Slick Extensions: %(slick_extensions_api_path)s/index.html
.. |slick_extensions_version| replace:: %(slick_extensions_version)s
''' % {
'template-suffix': slick_template_suffix
'template-suffix': slick_template_suffix,
'slick_extensions_version': slick_extensions_version,
'slick_extensions_api_path': slick_extensions_api_path
}
@@ -20,6 +20,6 @@ repository (which contains the required artifacts) to your build definition
like this:
.. parsed-literal::
libraryDependencies += "com.typesafe.slick" %% "slick-extensions" % "|release|"
libraryDependencies += "com.typesafe.slick" %% "slick-extensions" % "|slick_extensions_version|"
resolvers += "Typesafe Releases" at "http://repo.typesafe.com/typesafe/maven-releases/"
@@ -10,7 +10,7 @@ API Documentation (scaladoc)
* `Code Generator <codegen-api/index.html>`_ (slick-codegen)
* `HikariCP integration <hikaricp-api/index.html>`_ (slick-hikaricp)
* `TestKit <testkit-api/index.html>`_ (slick-testkit)
* `Slick Extensions <extensions-api/index.html>`_ (slick-extensions)
* `Slick Extensions`_ |slick_extensions_version| (slick-extensions)
User Manual
-----------

0 comments on commit 34bf73f

Please sign in to comment.