From 138a7f0a8ae4f7eebd1369976f667afa8015a225 Mon Sep 17 00:00:00 2001 From: starzu Date: Thu, 28 Jan 2016 08:58:43 +0100 Subject: [PATCH 01/13] Deployment configuration --- build.sbt | 35 +++++++++++++++++++++++++++++++++++ project/plugins.sbt | 4 ++++ 2 files changed, 39 insertions(+) diff --git a/build.sbt b/build.sbt index 36e1b7f..cae2d61 100644 --- a/build.sbt +++ b/build.sbt @@ -30,3 +30,38 @@ scalaJSUseRhino in Test := false lazy val root = project.in(file(".")) .enablePlugins(ScalaJSPlugin) + +// Deployment configuration +publishMavenStyle := true +publishArtifact in Test := false +pomIncludeRepository := { _ => false } + +publishTo := { + val nexus = "https://oss.sonatype.org/" + if (isSnapshot.value) + Some("snapshots" at nexus + "content/repositories/snapshots") + else + Some("releases" at nexus + "service/local/staging/deploy/maven2") +} + +pomExtra := { + https://github.com/UdashFramework/scala-js-jquery + + + Apache v.2 License + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + git@github.com:UdashFramework/scala-js-jquery.git + scm:git@github.com:UdashFramework/scala-js-jquery.git + + + + avsystem + AVSystem + http://www.avsystem.com/ + + +} diff --git a/project/plugins.sbt b/project/plugins.sbt index e513ea5..afe60eb 100755 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,3 +1,7 @@ logLevel := Level.Warn addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.9") + +// Deployment configuration +addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0") +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1") \ No newline at end of file From 57c8e2f017808ee0e17ab920568d6e6b26cc8b4b Mon Sep 17 00:00:00 2001 From: Mateusz Starzec Date: Tue, 22 Jan 2019 14:28:05 +0100 Subject: [PATCH 02/13] v3.0.1 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index ead37eb..b76070c 100644 --- a/build.sbt +++ b/build.sbt @@ -3,7 +3,7 @@ import org.openqa.selenium.chrome.ChromeOptions name := "udash-jquery" inThisBuild(Seq( - version := "3.0.0", + version := "3.0.1", organization := "io.udash", )) From 4968d5f983f143323eac1458cc450b764d2694d5 Mon Sep 17 00:00:00 2001 From: ddworak Date: Tue, 15 Oct 2019 06:57:25 +0200 Subject: [PATCH 03/13] Update deployment plugins --- project/plugins.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index c32bd8f..2b1dd16 100755 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -6,5 +6,5 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.29") addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.15.0-0.6") // Deployment configuration -addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2") -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.3") \ No newline at end of file +addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.0-M2") +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.4") \ No newline at end of file From 016f3d79ae27375e05238eb0065206f04e7ccb14 Mon Sep 17 00:00:00 2001 From: ddworak Date: Wed, 18 Mar 2020 14:50:46 +0100 Subject: [PATCH 04/13] Dependency upgrades --- build.sbt | 43 ++----------------- project/build.properties | 2 +- project/plugins.sbt | 8 ++-- .../jquery_test/DomManipulationTest.scala | 6 ++- .../jquery_test/EventsHandlingTest.scala | 9 ++-- .../jquery_test/MiscellaneousTest.scala | 10 +++-- .../wrappers/jquery_test/SelectorsTest.scala | 6 ++- .../wrappers/jquery_test/TraversingTest.scala | 7 +-- 8 files changed, 33 insertions(+), 58 deletions(-) diff --git a/build.sbt b/build.sbt index 8902567..4ca74b7 100644 --- a/build.sbt +++ b/build.sbt @@ -3,7 +3,7 @@ name := "udash-jquery" inThisBuild(Seq( - version := "3.0.2", + version := "3.0.3", organization := "io.udash", )) @@ -50,46 +50,11 @@ lazy val root = project.in(file(".")) commonJSSettings, libraryDependencies ++= Seq( - "org.scala-js" %%% "scalajs-dom" % "0.9.7", - "org.scalatest" %%% "scalatest" % "3.0.8" % Test, - "com.lihaoyi" %%% "scalatags" % "0.7.0" % Test + "org.scala-js" %%% "scalajs-dom" % "0.9.8", + "org.scalatest" %%% "scalatest" % "3.1.1" % Test, + "com.lihaoyi" %%% "scalatags" % "0.8.6" % Test ), Compile / npmDependencies += "jquery" -> "3.3.1", Test / requireJsDomEnv := true ) - -// Deployment configuration -publishMavenStyle := true -publishArtifact in Test := false -pomIncludeRepository := { _ => false } - -publishTo := { - val nexus = "https://oss.sonatype.org/" - if (isSnapshot.value) - Some("snapshots" at nexus + "content/repositories/snapshots") - else - Some("releases" at nexus + "service/local/staging/deploy/maven2") -} - -pomExtra := { - https://github.com/UdashFramework/scala-js-jquery - - - Apache v.2 License - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - git@github.com:UdashFramework/scala-js-jquery.git - scm:git@github.com:UdashFramework/scala-js-jquery.git - - - - avsystem - AVSystem - http://www.avsystem.com/ - - -} diff --git a/project/build.properties b/project/build.properties index ebcc8ac..c9c5a37 100755 --- a/project/build.properties +++ b/project/build.properties @@ -1,2 +1,2 @@ # suppress inspection "UnusedProperty" -sbt.version=1.3.2 \ No newline at end of file +sbt.version=1.3.8 \ No newline at end of file diff --git a/project/plugins.sbt b/project/plugins.sbt index 2b1dd16..ea0423d 100755 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,9 +2,9 @@ logLevel := Level.Warn libraryDependencies += "org.scala-js" %% "scalajs-env-selenium" % "0.3.0" -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.29") -addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.15.0-0.6") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.32") +addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler-sjs06" % "0.17.0") // Deployment configuration -addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.0-M2") -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.4") \ No newline at end of file +addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.0") +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8.1") \ No newline at end of file diff --git a/src/test/scala/io/udash/wrappers/jquery_test/DomManipulationTest.scala b/src/test/scala/io/udash/wrappers/jquery_test/DomManipulationTest.scala index ede038d..d16b4cc 100644 --- a/src/test/scala/io/udash/wrappers/jquery_test/DomManipulationTest.scala +++ b/src/test/scala/io/udash/wrappers/jquery_test/DomManipulationTest.scala @@ -1,8 +1,10 @@ package io.udash.wrappers.jquery_test -import org.scalatest.{Matchers, WordSpec} +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpec + +class DomManipulationTest extends AnyWordSpec with Matchers { -class DomManipulationTest extends WordSpec with Matchers { import io.udash.wrappers.jquery._ import scalatags.JsDom.all._ diff --git a/src/test/scala/io/udash/wrappers/jquery_test/EventsHandlingTest.scala b/src/test/scala/io/udash/wrappers/jquery_test/EventsHandlingTest.scala index 42fea1c..710fa0a 100644 --- a/src/test/scala/io/udash/wrappers/jquery_test/EventsHandlingTest.scala +++ b/src/test/scala/io/udash/wrappers/jquery_test/EventsHandlingTest.scala @@ -1,10 +1,13 @@ +package io.udash.wrappers.jquery_test + import org.scalajs.dom.Element import org.scalajs.dom.html.Input -import org.scalatest.{Matchers, WordSpec} +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpec -class EventsHandlingTest extends WordSpec with Matchers { - import io.udash.wrappers.jquery._ +class EventsHandlingTest extends AnyWordSpec with Matchers { + import io.udash.wrappers.jquery._ import scalatags.JsDom.all._ class C(i: Int) diff --git a/src/test/scala/io/udash/wrappers/jquery_test/MiscellaneousTest.scala b/src/test/scala/io/udash/wrappers/jquery_test/MiscellaneousTest.scala index 95b3953..4d32382 100644 --- a/src/test/scala/io/udash/wrappers/jquery_test/MiscellaneousTest.scala +++ b/src/test/scala/io/udash/wrappers/jquery_test/MiscellaneousTest.scala @@ -1,10 +1,11 @@ package io.udash.wrappers.jquery_test -import org.scalatest.{Matchers, WordSpec} +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpec -class MiscellaneousTest extends WordSpec with Matchers { - import io.udash.wrappers.jquery._ +class MiscellaneousTest extends AnyWordSpec with Matchers { + import io.udash.wrappers.jquery._ import scalatags.JsDom.all._ class C(i: Int) @@ -45,7 +46,8 @@ class MiscellaneousTest extends WordSpec with Matchers { } "serialize objects to URL query string" in { - import scala.scalajs.js, js.JSConverters._ + import scala.scalajs.js + import js.JSConverters._ jQ.param(js.Dynamic.literal("a" -> Seq(1, 2, 3).toJSArray, "b" -> "c")) should be("a%5B%5D=1&a%5B%5D=2&a%5B%5D=3&b=c") } } diff --git a/src/test/scala/io/udash/wrappers/jquery_test/SelectorsTest.scala b/src/test/scala/io/udash/wrappers/jquery_test/SelectorsTest.scala index 6654210..61ea636 100644 --- a/src/test/scala/io/udash/wrappers/jquery_test/SelectorsTest.scala +++ b/src/test/scala/io/udash/wrappers/jquery_test/SelectorsTest.scala @@ -1,8 +1,10 @@ package io.udash.wrappers.jquery_test -import org.scalatest.{Matchers, WordSpec} +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpec + +class SelectorsTest extends AnyWordSpec with Matchers { -class SelectorsTest extends WordSpec with Matchers { import io.udash.wrappers.jquery._ import scalatags.JsDom.all._ diff --git a/src/test/scala/io/udash/wrappers/jquery_test/TraversingTest.scala b/src/test/scala/io/udash/wrappers/jquery_test/TraversingTest.scala index 1400684..82116cf 100644 --- a/src/test/scala/io/udash/wrappers/jquery_test/TraversingTest.scala +++ b/src/test/scala/io/udash/wrappers/jquery_test/TraversingTest.scala @@ -1,10 +1,11 @@ package io.udash.wrappers.jquery_test -import org.scalatest.{Matchers, WordSpec} +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpec -class TraversingTest extends WordSpec with Matchers { - import io.udash.wrappers.jquery._ +class TraversingTest extends AnyWordSpec with Matchers { + import io.udash.wrappers.jquery._ import scalatags.JsDom.all._ "jQuery" should { From 1c7a60e8c8932b1c218741ed930f5509bdd7b4a9 Mon Sep 17 00:00:00 2001 From: ddworak Date: Wed, 18 Mar 2020 15:36:22 +0100 Subject: [PATCH 05/13] Bundler-only demo --- example/build.sbt | 44 ++----------------- .../global-demo/src/main/assets/index.html | 13 ------ example/project/Dependencies.scala | 7 +-- example/project/build.properties | 2 +- example/project/plugins.sbt | 4 +- .../src/main/assets/index.html | 0 6 files changed, 8 insertions(+), 62 deletions(-) delete mode 100644 example/global-demo/src/main/assets/index.html rename example/{bundler-demo => }/src/main/assets/index.html (100%) diff --git a/example/build.sbt b/example/build.sbt index 04eeabb..8f85222 100644 --- a/example/build.sbt +++ b/example/build.sbt @@ -1,13 +1,13 @@ name := "jquery-demo" inThisBuild(Seq( - version := "3.0.1", + version := "3.0.2", organization := "io.udash", )) val commonSettings = Seq( scalaVersion := "2.12.10", - crossScalaVersions := Seq("2.12.10"), //todo 2.13 + crossScalaVersions := Seq("2.12.10"), //todo 2.13 & SJS 1.0 with Udash 0.9 scalacOptions ++= Seq( "-feature", "-deprecation", @@ -33,46 +33,10 @@ val root = project.in(file(".")) .enablePlugins(ScalaJSPlugin) .settings(commonSettings) -val `jquery-global-demo` = project.in(file("global-demo")) - .enablePlugins(ScalaJSPlugin) - .settings( - commonSettings, - - jsDependencies ++= Dependencies.jsDeps.value, - - sourceDirsSettings(_.getParentFile), - - /* move these files out of target/. */ - Compile / fullOptJS / crossTarget := generatedGlobalDir, - Compile / fastOptJS / crossTarget := generatedGlobalDir, - Compile / packageJSDependencies / crossTarget := generatedGlobalDir, - Compile / packageMinifiedJSDependencies / crossTarget := generatedGlobalDir, - - Compile / fastOptJS := (Compile / fastOptJS).dependsOn(copyAssets).value, - Compile / fullOptJS := (Compile / fullOptJS).dependsOn(copyAssets).value, - - scalaJSUseMainModuleInitializer := true, - - copyAssets := { - IO.copyFile( - sourceDirectory.value / "main/assets/index.html", - generatedGlobalDir / "index.html" - ) - }, - - Compile / fastOptJS / artifactPath := - (Compile / fastOptJS / crossTarget).value / "scripts" / "frontend-impl.js", - Compile / fullOptJS / artifactPath := - (Compile / fullOptJS / crossTarget).value / "scripts" / "frontend-impl.js", - Compile / packageJSDependencies / artifactPath := - (Compile / packageJSDependencies / crossTarget).value / "scripts" / "frontend-deps.js", - Compile / packageMinifiedJSDependencies / artifactPath := - (Compile / packageMinifiedJSDependencies / crossTarget).value / "scripts" / "frontend-deps.js" - ) - val generatedBundlerDir = file("generated/bundler") val compileStatics = taskKey[Unit]("Compiles all static files.") -val `jquery-bundler-demo` = project.in(file("bundler-demo")) + +val example = project.in(file(".")) .enablePlugins(ScalaJSBundlerPlugin) .settings( commonSettings, diff --git a/example/global-demo/src/main/assets/index.html b/example/global-demo/src/main/assets/index.html deleted file mode 100644 index b746eab..0000000 --- a/example/global-demo/src/main/assets/index.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - jquery-demo - global scope - - -
- - - - - \ No newline at end of file diff --git a/example/project/Dependencies.scala b/example/project/Dependencies.scala index caa9172..32852d9 100644 --- a/example/project/Dependencies.scala +++ b/example/project/Dependencies.scala @@ -1,17 +1,12 @@ -import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._ import org.portablescala.sbtplatformdeps.PlatformDepsPlugin.autoImport._ import sbt._ object Dependencies { - val udashCoreVersion = "0.8.1" + val udashCoreVersion = "0.8.3" val udashJQueryVersion = "3.0.2" val deps = Def.setting(Seq[ModuleID]( "io.udash" %%% "udash-core" % udashCoreVersion, "io.udash" %%% "udash-jquery" % udashJQueryVersion )) - - val jsDeps = Def.setting(Seq[org.scalajs.sbtplugin.JSModuleID]( - "org.webjars" % "jquery" % "3.3.1" / "3.3.1/jquery.js" minified "3.3.1/jquery.min.js" - )) } \ No newline at end of file diff --git a/example/project/build.properties b/example/project/build.properties index ebcc8ac..c9c5a37 100644 --- a/example/project/build.properties +++ b/example/project/build.properties @@ -1,2 +1,2 @@ # suppress inspection "UnusedProperty" -sbt.version=1.3.2 \ No newline at end of file +sbt.version=1.3.8 \ No newline at end of file diff --git a/example/project/plugins.sbt b/example/project/plugins.sbt index cafe39a..c0848e6 100644 --- a/example/project/plugins.sbt +++ b/example/project/plugins.sbt @@ -1,4 +1,4 @@ logLevel := Level.Warn -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.29") -addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.15.0-0.6") \ No newline at end of file +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.32") +addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler-sjs06" % "0.17.0") \ No newline at end of file diff --git a/example/bundler-demo/src/main/assets/index.html b/example/src/main/assets/index.html similarity index 100% rename from example/bundler-demo/src/main/assets/index.html rename to example/src/main/assets/index.html From b71ad988dd574d1f05c8b9604b5f25448a2fb3d8 Mon Sep 17 00:00:00 2001 From: ddworak Date: Wed, 18 Mar 2020 15:40:02 +0100 Subject: [PATCH 06/13] SJS 1.0.1 --- build.sbt | 4 +--- project/plugins.sbt | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/build.sbt b/build.sbt index 4ca74b7..b330dc3 100644 --- a/build.sbt +++ b/build.sbt @@ -9,7 +9,7 @@ inThisBuild(Seq( val commonSettings = Seq( scalaVersion := "2.13.1", - crossScalaVersions := Seq("2.12.10", "2.13.1"), + crossScalaVersions := Seq("2.12.11", "2.13.1"), scalacOptions ++= Seq( "-feature", "-deprecation", @@ -29,7 +29,6 @@ val commonSettings = Seq( ) val commonJSSettings = Seq( - Compile / emitSourceMaps := true, Test / parallelExecution := false, Test / scalaJSStage := FastOptStage, // ScalaJSBundlerPlugin does not work with scalajs-env-selenium: @@ -40,7 +39,6 @@ val commonJSSettings = Seq( val githubDir = "https://raw.githubusercontent.com/UdashFramework/scala-js-jquery" s"-P:scalajs:mapSourceURI:$localDir->$githubDir/v${version.value}/" }, - scalacOptions += "-P:scalajs:sjsDefinedByDefault", ) lazy val root = project.in(file(".")) diff --git a/project/plugins.sbt b/project/plugins.sbt index ea0423d..ab16f2f 100755 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,8 +2,8 @@ logLevel := Level.Warn libraryDependencies += "org.scala-js" %% "scalajs-env-selenium" % "0.3.0" -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.32") -addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler-sjs06" % "0.17.0") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.0.1") +addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.17.0") // Deployment configuration addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.0") From 70fabcf43a2335c14e6f5769f176cae67abb3635 Mon Sep 17 00:00:00 2001 From: ddworak Date: Thu, 19 Mar 2020 07:13:01 +0100 Subject: [PATCH 07/13] CI cleanup --- .travis.yml | 2 +- example/build.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 56f862c..c1c2b6a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,4 +23,4 @@ before_script: script: - sbt +test +publishLocal - - cd example && sbt compile jquery-global-demo/fullOptJS jquery-bundler-demo/compileStatics \ No newline at end of file + - cd example && sbt compileStatics \ No newline at end of file diff --git a/example/build.sbt b/example/build.sbt index 8f85222..422bf9d 100644 --- a/example/build.sbt +++ b/example/build.sbt @@ -33,7 +33,7 @@ val root = project.in(file(".")) .enablePlugins(ScalaJSPlugin) .settings(commonSettings) -val generatedBundlerDir = file("generated/bundler") +val generatedBundlerDir = file("generated") val compileStatics = taskKey[Unit]("Compiles all static files.") val example = project.in(file(".")) From 949cb211a638a082f6ddfeb9f8e99d7a38dacaec Mon Sep 17 00:00:00 2001 From: ddworak Date: Thu, 19 Mar 2020 08:17:23 +0100 Subject: [PATCH 08/13] Travis setup for releasing --- .travis.yml | 49 ++++++++++++++++++++++++++++++++----------------- travis.gpg.enc | Bin 0 -> 3712 bytes 2 files changed, 32 insertions(+), 17 deletions(-) create mode 100644 travis.gpg.enc diff --git a/.travis.yml b/.travis.yml index c1c2b6a..86def1f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,26 +1,41 @@ -language: scala dist: trusty - +language: scala jdk: openjdk11 - scala: - 2.13.1 +stages: + - test + - name: release + if: tag =~ ^v + before_script: - - "export DISPLAY=:99.0" - - "sh -e /etc/init.d/xvfb start" - - sleep 3 # give xvfb some time to start - # Instal google-chrome - - export CHROME_BIN=/usr/bin/google-chrome - - sudo apt-get update - - sudo apt-get install -y libappindicator1 fonts-liberation - - wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb - - sudo dpkg -i google-chrome*.deb - # Install Selenium chromedriver - - wget http://chromedriver.storage.googleapis.com/2.38/chromedriver_linux64.zip - - unzip chromedriver_linux64.zip -d selenium-bin - - export PATH=$PWD/selenium-bin:$PATH + - wget https://github.com/mozilla/geckodriver/releases/download/v0.24.0/geckodriver-v0.24.0-linux64.tar.gz + - mkdir geckodriver + - tar -xzf geckodriver-v0.24.0-linux64.tar.gz -C geckodriver + - export PATH=$PWD/geckodriver:$PATH script: - sbt +test +publishLocal - - cd example && sbt compileStatics \ No newline at end of file + - cd example && sbt compileStatics + +jobs: + include: + - stage: release + script: + - openssl aes-256-cbc -K $encrypted_f00a6d0a0202_key -iv $encrypted_f00a6d0a0202_iv -in travis/travis.gpg.enc -out travis/travis.gpg -d + - gpg --import travis/travis.gpg + - test $TRAVIS_PULL_REQUEST = "false" && sbt +publishSigned sonatypeBundleRelease + +before_cache: + # Cleanup the cached directories to avoid unnecessary cache updates + - rm -fv $HOME/.ivy2/.sbt.ivy.lock + - find $HOME/.ivy2/cache -name "ivydata-*.properties" -print -delete + - find $HOME/.sbt -name "*.lock" -print -delete + +cache: + directories: + - $HOME/.ivy2/cache + - $HOME/.m2 + - $HOME/.cache + - $HOME/.sbt \ No newline at end of file diff --git a/travis.gpg.enc b/travis.gpg.enc new file mode 100644 index 0000000000000000000000000000000000000000..399e4773eceb781b839288110f4eb79b00f9e135 GIT binary patch literal 3712 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 literal 0 HcmV?d00001 From 08e13154aa86336105245e7a4b5d3dcdca5d507e Mon Sep 17 00:00:00 2001 From: ddworak Date: Thu, 19 Mar 2020 08:19:03 +0100 Subject: [PATCH 09/13] Default to snapshot version in dev --- build.sbt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index b330dc3..f69a332 100644 --- a/build.sbt +++ b/build.sbt @@ -3,8 +3,9 @@ name := "udash-jquery" inThisBuild(Seq( - version := "3.0.3", + version := sys.env.get("TRAVIS_TAG").filter(_.startsWith("v")).map(_.drop(1)).getOrElse("3.0.0-SNAPSHOT"), organization := "io.udash", + cancelable := true, )) val commonSettings = Seq( From 6e10c20ebadce3b5fbcaa3fd17339612b4525255 Mon Sep 17 00:00:00 2001 From: ddworak Date: Thu, 19 Mar 2020 08:20:34 +0100 Subject: [PATCH 10/13] Travis fix --- .travis.yml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 86def1f..1534178 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,18 +9,17 @@ stages: - name: release if: tag =~ ^v -before_script: - - wget https://github.com/mozilla/geckodriver/releases/download/v0.24.0/geckodriver-v0.24.0-linux64.tar.gz - - mkdir geckodriver - - tar -xzf geckodriver-v0.24.0-linux64.tar.gz -C geckodriver - - export PATH=$PWD/geckodriver:$PATH - -script: - - sbt +test +publishLocal - - cd example && sbt compileStatics - jobs: include: + - stage: test + before_script: + - wget https://github.com/mozilla/geckodriver/releases/download/v0.24.0/geckodriver-v0.24.0-linux64.tar.gz + - mkdir geckodriver + - tar -xzf geckodriver-v0.24.0-linux64.tar.gz -C geckodriver + - export PATH=$PWD/geckodriver:$PATH + script: + - sbt +test +publishLocal + - cd example && sbt compileStatics - stage: release script: - openssl aes-256-cbc -K $encrypted_f00a6d0a0202_key -iv $encrypted_f00a6d0a0202_iv -in travis/travis.gpg.enc -out travis/travis.gpg -d From a236e022f005c50cdbbe4d9429ffd4dd46e544fa Mon Sep 17 00:00:00 2001 From: ddworak Date: Thu, 19 Mar 2020 09:15:53 +0100 Subject: [PATCH 11/13] Complete autopublish setup --- .travis.yml | 24 ++++++++++++------------ build.sbt | 38 +++++++++++++++++++++++++++++++++++--- project/plugins.sbt | 4 +--- 3 files changed, 48 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1534178..5bb28bf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,34 +7,34 @@ scala: stages: - test - name: release - if: tag =~ ^v + - if: tag =~ ^v jobs: include: - stage: test - before_script: - - wget https://github.com/mozilla/geckodriver/releases/download/v0.24.0/geckodriver-v0.24.0-linux64.tar.gz - - mkdir geckodriver - - tar -xzf geckodriver-v0.24.0-linux64.tar.gz -C geckodriver - - export PATH=$PWD/geckodriver:$PATH script: - sbt +test +publishLocal - cd example && sbt compileStatics - stage: release script: - - openssl aes-256-cbc -K $encrypted_f00a6d0a0202_key -iv $encrypted_f00a6d0a0202_iv -in travis/travis.gpg.enc -out travis/travis.gpg -d + - openssl aes-256-cbc -K $encrypted_f00a6d0a0202_key -iv $encrypted_f00a6d0a0202_iv + -in travis/travis.gpg.enc -out travis/travis.gpg -d - gpg --import travis/travis.gpg - test $TRAVIS_PULL_REQUEST = "false" && sbt +publishSigned sonatypeBundleRelease before_cache: - # Cleanup the cached directories to avoid unnecessary cache updates - rm -fv $HOME/.ivy2/.sbt.ivy.lock - find $HOME/.ivy2/cache -name "ivydata-*.properties" -print -delete - find $HOME/.sbt -name "*.lock" -print -delete cache: directories: - - $HOME/.ivy2/cache - - $HOME/.m2 - - $HOME/.cache - - $HOME/.sbt \ No newline at end of file + - "$HOME/.ivy2/cache" + - "$HOME/.m2" + - "$HOME/.cache" + - "$HOME/.sbt" + +env: + global: + - secure: rG9cHG3au9EUYQSJKHAsMxws3IW/tSxG1Y/xbuW2Ri1JVr6L6c9ig8gYj4Hju5KkVvxXejb1/8bYCoZEP1vZpNeSkNordHECp0l+i9mI5ZFo5RN3vMCq4/0xWEQTdZ7c3BjN+pn4veDJ+W8cHFXgivC9tsX7FEbksz4bFVIm1knvz5r7HN4ntgQUeLwY/J9EpKSr/TYZsnEcf8aH9q6tvTLqcfYAR6ggs68Kc2qJ5sII0rj3vP2NANjTLuvdkPSe3i/9KCDRDr9KIoVsam4LfFDG8YXSNWBP3OQU86DF19V0brt6WGGX6G5V2dyjlHyyUy0GBFJOlPmfkEL8ylOprGy1OPw40ZPRbtzpbztFlVmgJoO3UcKIWlyB8umz0M9A+E3Of3P9mTnskAe366VPSq8R/G3kxc7ictZDQH7hgf2nKqlFQNXCJkBqynWRlC0HQ31izrACqNmmYdwQspUnAFVOEFSmfXu8sPVyOSQhHT4IG+xgG4KCKdC8Cv4buOFDzj4z0DRnfJwR71KvxA9KGhUtMZXXqfdZANThHMV1bsi3S3UPQKqRg62aja4+I7lzbwrPRbkDPsl0eTdULF39jIMnbfjC2TqeCgfG+tpel0DBMBOuuESvTVFVX38HSgK1QNhSAAu1nrVIFtZQbKDZLOm7hCgfOJO6v65R3PgIFFI= + - secure: wjX1uXAYdNxpUr1nz9cQ96cgJI3wUqJ7hIQlHwtg1gLJJtgdf6STSTbAm1IKMb0Ouytc2muC1H8jhBbv94tyZh2/NI7IDk7OY2wcLobH2Jh/wnDEAAcATIhqR/oFtSdqr0umr1HDevUPIBU/ZFViCPribnCQ/Rxn8jttguGd3Ho1k1dxzJ9pEiET66nU8CnW0j8g1Nkg540xFPff0Q+1C7+3akU03KwLnh8C0KR1oGhT354IhocLtFKWPuD9GTXAiA6qcOZ0cmUlv8jwHhWyJ6dmVkOlv873nGPrFaWEDPepNkGaAz2TYjkeFS0YS8q1zbd7YM0opnQd8TJCnFddyzc09+1d5RMAJVWdKOKVjrbDwvKaNWfEHW6GXJ83xm8cbo3dCREfL7UTKjejkQTRgmj2BdrZVRB9xs+XKZpZi0ECVbIrwik9tyYoiuSHe96yNN3Ma56Q4x094ZTvsccjy7pET4FCpNwrFu0aD+HFPerWB/xlr9ILz7sWy99r4eafS+O2eidoQnPIHAHZ+z/k9ExQedKUzTxO/skgrf1FvswrY7cpfnNApOhCSKm8C5NfMB5BC7M7OsYqDIhIwfs/Q3J9gw18F4fa9czpnduVzkpQUGdZ2vtS+oxDGICB7uaxkRq7HudHHElhz4w9qEOIMpTJjICPa38Hr/fKGxpuhKE= \ No newline at end of file diff --git a/build.sbt b/build.sbt index f69a332..ed68634 100644 --- a/build.sbt +++ b/build.sbt @@ -27,14 +27,46 @@ val commonSettings = Seq( "-Ycache-plugin-class-loader:last-modified", "-Ycache-macro-class-loader:last-modified", ), + autoAPIMappings := true, + publishMavenStyle := true, + publishArtifact in Test := false, + pomIncludeRepository := { _ => false }, + + publishTo := sonatypePublishToBundle.value, + + credentials in Global += Credentials( + "Sonatype Nexus Repository Manager", + "oss.sonatype.org", + sys.env.getOrElse("SONATYPE_USERNAME", ""), + sys.env.getOrElse("SONATYPE_PASSWORD", "") + ), + + pomExtra := { + https://github.com/UdashFramework/scala-js-jquery + + + Apache v.2 License + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + git@github.com:UdashFramework/scala-js-jquery.git + scm:git@github.com:UdashFramework/scala-js-jquery.git + + + + avsystem + AVSystem + http://www.avsystem.com/ + + + } ) val commonJSSettings = Seq( Test / parallelExecution := false, Test / scalaJSStage := FastOptStage, - // ScalaJSBundlerPlugin does not work with scalajs-env-selenium: - // https://github.com/scalacenter/scalajs-bundler/issues/89 - // Test / jsEnv := new SeleniumJSEnv(browserCapabilities), scalacOptions += { val localDir = (ThisBuild / baseDirectory).value.toURI.toString val githubDir = "https://raw.githubusercontent.com/UdashFramework/scala-js-jquery" diff --git a/project/plugins.sbt b/project/plugins.sbt index ab16f2f..418498b 100755 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,10 +1,8 @@ logLevel := Level.Warn -libraryDependencies += "org.scala-js" %% "scalajs-env-selenium" % "0.3.0" - addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.0.1") addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.17.0") // Deployment configuration -addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.0") +addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.1") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8.1") \ No newline at end of file From f5328c14488d8f1719f84ab60c88a31b005ef916 Mon Sep 17 00:00:00 2001 From: ddworak Date: Thu, 19 Mar 2020 09:22:28 +0100 Subject: [PATCH 12/13] Move key file --- travis.gpg.enc => travis/travis.gpg.enc | Bin 1 file changed, 0 insertions(+), 0 deletions(-) rename travis.gpg.enc => travis/travis.gpg.enc (100%) diff --git a/travis.gpg.enc b/travis/travis.gpg.enc similarity index 100% rename from travis.gpg.enc rename to travis/travis.gpg.enc From 4acb8d5453b66e66951321f62156189eac8d5f66 Mon Sep 17 00:00:00 2001 From: ddworak Date: Thu, 19 Mar 2020 09:23:03 +0100 Subject: [PATCH 13/13] Attempt to cleanup stages --- .travis.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5bb28bf..e2322af 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,11 +4,6 @@ jdk: openjdk11 scala: - 2.13.1 -stages: - - test - - name: release - - if: tag =~ ^v - jobs: include: - stage: test @@ -16,6 +11,7 @@ jobs: - sbt +test +publishLocal - cd example && sbt compileStatics - stage: release + if: tag =~ ^v script: - openssl aes-256-cbc -K $encrypted_f00a6d0a0202_key -iv $encrypted_f00a6d0a0202_iv -in travis/travis.gpg.enc -out travis/travis.gpg -d