Merge pull request #78 from com-lihaoyi/publish-scala-2.11

Publish for Scala 2.11

Author: lolgab

.github/workflows/actions.yml

@@ -0,0 +1,51 @@
+name: ci
+
+on:
+  push:
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 8
+      - name: Run tests
+        run: ./mill -i __.publishArtifacts __.test
+
+  publish-sonatype:
+    if: github.repository == 'com-lihaoyi/requests-scala' && contains(github.ref, 'refs/tags/')
+    needs: test
+    runs-on: ubuntu-latest
+    env:
+      SONATYPE_PGP_PRIVATE_KEY: ${{ secrets.SONATYPE_PGP_PRIVATE_KEY }}
+      SONATYPE_PGP_PRIVATE_KEY_PASSWORD: ${{ secrets.SONATYPE_PGP_PRIVATE_KEY_PASSWORD }}
+      SONATYPE_USER: ${{ secrets.SONATYPE_USER }}
+      SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+      LANG: "en_US.UTF-8"
+      LC_MESSAGES: "en_US.UTF-8"
+      LC_ALL: "en_US.UTF-8"
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 8
+      - name: Publish to Maven Central
+        run: |
+          if [[ $(git tag --points-at HEAD) != '' ]]; then
+            echo $SONATYPE_PGP_PRIVATE_KEY | base64 --decode > gpg_key
+            gpg --import --no-tty --batch --yes gpg_key
+            rm gpg_key
+            ./mill -i mill.scalalib.PublishModule/publishAll \
+              --sonatypeCreds $SONATYPE_USER:$SONATYPE_PASSWORD \
+              --gpgArgs --passphrase=$SONATYPE_PGP_PRIVATE_KEY_PASSWORD,--no-tty,--pinentry-mode,loopback,--batch,--yes,-a,-b \
+              --publishArtifacts __.publishArtifacts \
+              --readTimeout 600000 \
+              --awaitTimeout 600000 \
+              --release true \
+              --signed true
+          fi

.travis.yml

@@ -1,12 +1,14 @@
 import mill._
 import mill.scalalib.publish.{Developer, License, PomSettings, VersionControl}
 import scalalib._
+import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version_mill0.9:0.1.1`
+import de.tobiasroeser.mill.vcs.version.VcsVersion
 
 val dottyVersion = Option(sys.props("dottyVersion"))
 
-object requests extends Cross[RequestsModule]((List("2.12.6", "2.13.0", "3.0.0-RC1") ++ dottyVersion): _*)
+object requests extends Cross[RequestsModule]((List("2.12.6", "2.13.0", "2.11.12", "3.0.0-RC1") ++ dottyVersion): _*)
 class RequestsModule(val crossScalaVersion: String) extends CrossScalaModule with PublishModule {
-  def publishVersion = "0.6.5"
+  def publishVersion = VcsVersion.vcsState().format()
   def artifactName = "requests"
   def pomSettings = PomSettings(
     description = "Scala port of the popular Python Requests HTTP client",
@@ -19,23 +21,13 @@ class RequestsModule(val crossScalaVersion: String) extends CrossScalaModule wit
     )
   )
   def ivyDeps = Agg(
-    ivy"com.lihaoyi::geny::0.6.5"
+    ivy"com.lihaoyi::geny::0.6.7"
   )
   object test extends Tests{
     def ivyDeps = Agg(
       ivy"com.lihaoyi::utest::0.7.7",
-      ivy"com.lihaoyi::ujson::1.2.3"
+      ivy"com.lihaoyi::ujson::1.3.9"
     )
     def testFrameworks = Seq("utest.runner.Framework")
   }
-  // FIXME: scaladoc 3 is not supported by mill yet. Remove the override
-  // once it is.
-  override def docJar =
-    if (crossScalaVersion.startsWith("2")) super.docJar
-    else T {
-      val outDir = T.ctx().dest
-      val javadocDir = outDir / 'javadoc
-      os.makeDir.all(javadocDir)
-      mill.api.Result.Success(mill.modules.Jvm.createJar(Agg(javadocDir))(outDir))
-    }
 }

build.sc

@@ -3,7 +3,7 @@
 # This is a wrapper script, that automatically download mill from GitHub release pages
 # You can give the required mill version with MILL_VERSION env variable
 # If no version is given, it falls back to the value of DEFAULT_MILL_VERSION
-DEFAULT_MILL_VERSION=0.9.5
+DEFAULT_MILL_VERSION=0.9.5-52-ef6d5d
 
 set -e
 

mill

@@ -191,13 +191,13 @@ case class Requester(verb: String,
           case c: HttpsURLConnection =>
             if (cert != null) {
               c.setSSLSocketFactory(Util.clientCertSocketFactory(cert, verifySslCerts))
-              if (!verifySslCerts) c.setHostnameVerifier((_: String, _: SSLSession) => true)
+              if (!verifySslCerts) c.setHostnameVerifier(new HostnameVerifier { def verify(h: String, s: SSLSession) = true })
             } else if (sslContext != null) {
               c.setSSLSocketFactory(sslContext.getSocketFactory)
-              if (!verifySslCerts) c.setHostnameVerifier((_: String, _: SSLSession) => true)
+              if (!verifySslCerts) c.setHostnameVerifier(new HostnameVerifier { def verify(h: String, s: SSLSession) = true })
             } else if (!verifySslCerts) {
               c.setSSLSocketFactory(Util.noVerifySocketFactory)
-              c.setHostnameVerifier((_: String, _: SSLSession) => true)
+              c.setHostnameVerifier(new HostnameVerifier { def verify(h: String, s: SSLSession) = true })
             }
             c
           case c: HttpURLConnection => c