Infrastructure updates

ndw · Mar 29, 2020 · 80e8c28 · 80e8c28
1 parent 6d6bdfe
commit 80e8c28
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 56 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,11 +14,12 @@ install:
   - echo sonatypePassword=none >> gradle.properties
 
 deploy:
-  skip_cleanup: true
   provider: releases
   api_key:
-    secure: j77OqQiN3GvSBVgEAydcfh/kcLMKTUuYAIVUGmeISkpg3Gkmndo0Yw+/767Awz2siLdvetjc+7osHKFGHxBIEIGPQN98SK0wf4m823tZ09zZVCGaDi920BRwXFFPRbbu3BOm8DPw6xCPXLjoPglzPMrRVOgb8Ugh0NWuBe3gWWIihz2bilKzyslx5+mVbNZWoTBFr9rfqzOOM2/47Tf6f1pltXa1kHN74Qlk4txQeERe5s1v/t6mW8REaNgRXVYFP64U2kf1s6H+5dNh+DmrUX/8kNSTTZcqOrxWC2eYxy+DkPCCKVotOD5RrVyCG9N/7u+jA0WCAOWaE76Wjec6m7BYnvJZBB9A1adZrHz9iwAPfrq6rkYa2qaoitTz5zPv6qlNSQYC1Ip4RVJHj3mab1y8ZIU+Wjc/7JXcE2iLU6htSchtI4pJi0bApbyD2G01EbN0v7BH805miIpSQT17vg43CvV3zKU83l/UX+MNf26FXt2F3ipvjJWe7HpMuzW0QYyAQeHHvp8ESpfje92HTN3OgC/xqW7SCNmXUfFioGlv7E8083BHJWeP4zvuhZN3LExBfmuwi20sq78pjk/oxEeEMk5q8Y8Wf/yazFabIlF1YeQ02reKrrGrlbF8g2xHSEq0iWZv5xLaq4DSbwDntPVJbWU1+wiD/D6GrJH+Lug=
+    secure: BkAXFJuzGZ8H9dq253uqlJ3pp8WKphOwydKlC4poSczG4ps57eZ+yxeJ/IOWbO/s789c/E8q0k8IbhIZol8pHX0C+4jPdBkmrb1k7AfhSZnViJxDzw4r1hbtlITmuCfWAAK48NW1iDE23WxS5qpO4YgMfipMlT/nEJ9te73FGThl1xxhbLwSEnccd06SBKmsoK+kNX3KKpa7fdu3gc2BZoSU3kd6CHONemQnJp0F5H7JH2DtADWDizB90AADslOmcCy+17ornsDF0akCKOCIIYpaCCAQjKSNZSlCSDTxJvS2syXUxsllDfjiqIBCL9yVF+VDyVW2wr6ap009Ag86G1YjSXqRJHuM/dclHw//tGKrWDrckNb8R1FP7cxT9WdJpCZXblhCNN5+eLz6Qc4ZkyrcBM/e9c8LsHpZ4afYp7ZCa9Ste7w5qHKRTuRJnjGCxVz8QRccjhsPJ5qCFc8wmkVwCaKo/Ip6+ISamo9L1rcYDPKu5aSBNVpLYtkbreM6FFArhXYgjGBSqhRKwCJJfIFW8c/1fP4u3gl/UyPoOuESDE5BekBiYeRZKJ8CRVjTX0gkdHxB2rDJSnMyGRVyJI7TzoYYZmBjkqOsJ79BGJZ4z/A4OxOhfz24PXXCCUE2v6PpQXiZ4BBrNPlIPptphiXuV6V7yhKqeiWbowQ/TH0=
+  skip_cleanup: true
   file: build/distributions/xmlcalabash1-pygments-$TRAVIS_TAG.zip
   on:
     tags: true
     all_branches: true
+
diff --git a/build.gradle b/build.gradle
@@ -5,13 +5,13 @@ buildscript {
 
   dependencies {
     classpath group: 'net.sf.saxon', name: 'Saxon-HE', version: saxonVersion
-    classpath group: 'biz.aQute.bnd', name: 'biz.aQute.bnd.gradle', version: '4.2.0'
+    classpath group: 'biz.aQute.bnd', name: 'biz.aQute.bnd.gradle', version: '5.0.1'
   }
 }
 
 plugins {
   id "java"
-  id "maven"
+  id "maven-publish"
   id "signing"
 }
 
@@ -33,9 +33,9 @@ def sPatch   = saxonVersionMatcher[0][4]
 
 project.ext.saxonRelease = sMajor + "." + sMinor + "." + sRelease
 project.ext.saxonBranch  = sMajor + sMinor
-project.ext.releaseVersion = version
-project.ext.distVersion = version + snapshot
-version = project.ext.distVersion // - gets turned into . in some contexts
+project.ext.releaseVersion = relVersion
+project.ext.distVersion = relVersion + snapshot
+relVersion = project.ext.distVersion // - gets turned into . in some contexts
 
 repositories {
   mavenCentral()
@@ -59,15 +59,16 @@ configurations.all {
 }
 
 dependencies {
-  compileOnly (
+  implementation (
     [group: 'com.nwalsh', name: 'nwalsh-annotations', version: '1.0.1'],
+    [group: 'com.xmlcalabash', name: 'xmlcalabash', version: xmlCalabashVersion],
   )
-  annotationProcessor (
-    [group: 'com.nwalsh', name: 'nwalsh-annotations', version: '1.0.1'],
-  )
-  compile (
-    [group: 'com.xmlcalabash', name: 'xmlcalabash', version: "1.1.27-" + saxonBranch],
-  )
+}
+
+compileJava {
+  options.deprecation = true
+  options.compilerArgs += ['-Xlint:deprecation']
+  options.annotationProcessorPath = configurations.compileClasspath
 }
 
 task copyLib(type: Copy) {
@@ -83,6 +84,7 @@ task copyLib(type: Copy) {
 }
 
 jar {
+  archiveBaseName = "xmlcalabash1-pygments-" + relVersion
   bnd ('Bundle-Vendor': 'Norman Walsh',
        'Bundle-Description': 'XML Calabash 1.x Pygments step',
        'Bundle-Name': 'xmlcalabash1-pygments',
@@ -131,7 +133,7 @@ task copyJavaDoc(dependsOn: javadoc, type: Copy) {
 }
 
 task testStep(type: JavaExec) {
-  classpath = configurations.copydep + configurations.runtime + sourceSets.main.output
+  classpath = configurations.copydep + configurations.runtimeClasspath + sourceSets.main.output
 
   main = 'com.xmlcalabash.drivers.Main'
   maxHeapSize = "1024m"
@@ -140,73 +142,71 @@ task testStep(type: JavaExec) {
 
 task makeDist(dependsOn: [ build, copyJar, copyLib ]) {
   doLast {
-    println "Created distribution in build/dist"
+    println("Created distribution in build/dist")
   }
 }
 
 task zipDist(dependsOn: makeDist, type: Zip) {
   from('build/dist')
   into 'xmlcalabash1-pygments-' + distVersion
-  archiveName 'xmlcalabash1-pygments-' + distVersion + ".zip"
+  archiveFileName = 'xmlcalabash1-pygments-' + distVersion + ".zip"
 }
 
 task dist(dependsOn: [testStep, zipDist]) {
   // nop
 }
 
-artifacts {
-  archives javadocJar
-  archives sourcesJar
-}
-
 signing {
-  required { gradle.taskGraph.hasTask("uploadArchives") }
-  sign configurations.archives
+  sign publishing.publications
 }
 
-uploadArchives {
-  repositories {
-    mavenDeployer {
-      configuration = configurations.deployerJars
-
-      beforeDeployment { MavenDeployment deployment ->
-        signing.signPom(deployment) }
-
-      repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
-        authentication(userName: sonatypeUsername, password: sonatypePassword)
-      }
-
-      snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
-        authentication(userName: sonatypeUsername, password: sonatypePassword)
-      }
-
-      pom.project {
-        name 'XML Calabash Pygments step'
-        packaging 'jar'
-        description 'XML Calabash extension step send pygments'
-        url 'https://github.com/ndw/xmlcalabash1-pygments'
+publishing {
+  publications {
+    mavenJava(MavenPublication) {
+      pom {
+        name = 'XML Calabash Pygments step'
+        packaging = 'jar'
+        description = 'XML Calabash extension step send pygments'
+        url = 'https://github.com/ndw/xmlcalabash1-pygments'
 
         scm {
-          url 'scm:git@github.com:ndw/xmlcalabash1-pygments.git'
-          connection 'scm:git@github.com:ndw/xmlcalabash1-pygments.git'
-          developerConnection 'scm:git@github.com:ndw/xmlcalabash1-pygments.git'
+          url = 'scm:git@github.com:ndw/xmlcalabash1-pygments.git'
+          connection = 'scm:git@github.com:ndw/xmlcalabash1-pygments.git'
+          developerConnection = 'scm:git@github.com:ndw/xmlcalabash1-pygments.git'
         }
 
         licenses {
           license {
-            name 'The Apache Software License, Version 2.0'
-            url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-            distribution 'repo'
+            name = 'The Apache Software License, Version 2.0'
+            url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+            distribution = 'repo'
           }
         }
 
         developers {
           developer {
-            id 'ndw'
-            name 'Norman Walsh'
+            id = 'ndw'
+            name = 'Norman Walsh'
           }
         }
       }
+
+      groupId = "com.xmlcalabash"
+      artifactId = "xmlcalabash1-pygments"
+      version = relVersion
+      from components.java
+      artifact javadocJar
+      artifact sourcesJar
+    }
+  }
+
+  repositories {
+    maven {
+      url = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
+      credentials {
+        username = sonatypeUsername
+        password = sonatypePassword
+      }
     }
   }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,8 @@
-version=1.1.1
+relVersion=1.2.0
 snapshot=
 
 group=com.xmlcalabash
 builtBy=Norman Walsh
 
-saxonVersion=9.9.1-5
+saxonVersion=9.9.1-7
+xmlCalabashVersion=1.1.30-99
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/resources/com.xmlcalabash.properties b/src/main/resources/com.xmlcalabash.properties
@@ -0,0 +1,2 @@
+cx = namespace http://xmlcalabash.com/ns/extensions
+com.xmlcalabash.extensions.Pygments = step cx:pygments