Updated deps, upgraded plugins and refactored project structure

.github/workflows/gradle.yml

@@ -0,0 +1,26 @@
+# This workflow will build a Java project with Gradle
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
+
+name: Java CI with Gradle
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+    - name: Build project with Gradle
+      run: ./gradlew build

.sdkmanrc

@@ -0,0 +1,3 @@
+# Enable auto-env through the sdkman_auto_env config
+# Add key=value pairs of SDKs to use below
+java=8.0.275-amzn

Makefile

@@ -6,32 +6,15 @@ help:
 	cat Makefile.txt
 
 clean:
-	cd ${mkfile_dir}/gwt-uploader && ./gradlew clean
-	cd ${mkfile_dir}/gwt-uploader-demo && ./gradlew clean
-	cd ${mkfile_dir}
+	./gradlew clean
 
 .PHONY: build
 build:
-	cd ${mkfile_dir}/gwt-uploader && ./gradlew build
-	cd ${mkfile_dir}/gwt-uploader-demo && ./gradlew build
-	cd ${mkfile_dir}
+	./gradlew build
 
 release:
-	cd ${mkfile_dir}/gwt-uploader && ./gradlew release && cd ${mkfile_dir}
-
-install:
-	rm -rf ~/.m2/repository/org/wisepersist/gwt-uploader/
-	cd ${mkfile_dir}/gwt-uploader && ./gradlew clean build install
-
-publishSnapshot:
-	cd ${mkfile_dir}/gwt-uploader && ./gradlew build install uploadArchives && \
-	cd ${mkfile_dir}
+	./gradlew release -Prelease.useAutomaticVersion=true
 
 publish:
-	cd ${mkfile_dir}/gwt-uploader && git checkout tags/${LATEST_TAG} && \
-	./gradlew build install uploadArchives && git checkout master && \
-	cd ${mkfile_dir}
-
-deploy:
-	cd ${mkfile_dir}/gwt-uploader-demo && ./gradlew build appengineUpdate && \
-	cd ${mkfile_dir}
+	rm -rf $$HOME/.m2/repository/org/docstr/gwt-uploader
+	./gradlew build publishMavenJavaPublicationToMavenLocal publishMavenJavaPublicationToMavenRepository

Makefile.txt

@@ -1,13 +1,10 @@
----------------------------------------------------------------------
-Usage: make clean|build|release|install|publish|deploy"
 
-  clean           - clean the build folders
-  build           - build the projects
-  release         - create a new release of gwt-uploader
-  install         - install the current Maven artifacts into local maven
-  publishSnapshot - publish the latest snapshot of gwt-uploader
-  publish         - publish the latest stable release of gwt-uploader
-                    to Maven central
-  deploy          - deploy gwt-upload-demo to remote AppEngine
+Usage: make options...
+
+Option            Description
+------            -----------
+clean             Clean build directories of projects
+build             Build projects with tests and quality checking
+release           Create a new release from master branch
+publish           Publish the latest version to Maven central
 
----------------------------------------------------------------------

build.gradle

@@ -0,0 +1,194 @@
+plugins {
+  // https://github.com/researchgate/gradle-release
+  // https://plugins.gradle.org/plugin/net.researchgate.release
+  id "net.researchgate.release" version "3.0.2"
+}
+
+allprojects {
+  apply plugin: "java"
+  apply plugin: "idea"
+  apply plugin: "maven-publish"
+
+  group = "org.docstr"
+  version = "$version"
+}
+
+subprojects {
+  repositories {
+    mavenLocal()
+    mavenCentral()
+    google()
+    maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
+    maven { url "https://plugins.gradle.org/m2/" }
+  }
+
+  def javaVersion = JavaVersion.VERSION_1_8
+  sourceCompatibility = javaVersion
+  targetCompatibility = javaVersion
+
+  task enforceVersion {
+    doLast {
+      def foundVersion = JavaVersion.current()
+      if (foundVersion != javaVersion)
+        throw new IllegalStateException("Wrong Java version; required is "
+            + javaVersion + ", but found " + foundVersion)
+    }
+  }
+  compileJava.dependsOn(enforceVersion)
+
+  project.extensions.idea.module.iml {
+    withXml {
+      it.asNode().component.
+          find { it.@name == "NewModuleRootManager" }.@LANGUAGE_LEVEL = target.level
+    }
+  }
+
+  // ensure that test resources (src/test/resources) are added to CLASSPATH;
+  // see http://forums.gradle.org/gradle/topics/tests_arent_executed_when_setting_the_test_runtimeclasspath and
+  // http://gradle.org/docs/current/dsl/org.gradle.api.tasks.testing.Test.html#org.gradle.api.tasks.testing.Test:classpath
+  sourceSets {
+    main {
+      runtimeClasspath = files(output.resourcesDir) + runtimeClasspath
+    }
+    test {
+      runtimeClasspath = files(output.resourcesDir) + runtimeClasspath
+    }
+  }
+
+  test {
+    // enable TestNG support (default is JUnit)
+    useTestNG() {
+      suiteXmlBuilder().suite(name: "gwt-ace", parallel: "tests") {
+        test(name: "all-tests") {
+          packages {
+            "package"(name: "com.docstr.*")
+          }
+        }
+      }
+      excludeGroups "integration", "stress"
+      // useDefaultListeners = true produces the testng-results.xml files used by bamboo
+      // to display test result summaries
+      useDefaultListeners = true
+    }
+  }
+
+  configurations.all {
+    resolutionStrategy {
+      // fail eagerly on version conflict (includes transitive dependencies)
+      // e.g. multiple different versions of the same dependency (group and name are equal)
+      failOnVersionConflict()
+
+      // force certain versions of dependencies (including transitive)
+      //  *append new forced modules:
+      force "com.google.guava:guava:31.0.1-jre",
+          "com.google.inject:guice:4.1.0",
+          "com.google.inject.extensions:guice-assistedinject:4.1.0",
+          "com.google.inject.extensions:guice-multibindings:4.1.0",
+          "com.google.inject.extensions:guice-servlet:4.1.0",
+          "com.google.code.findbugs:annotations:3.0.1",
+          "com.google.code.findbugs:jsr305:3.0.1",
+          "com.google.jsinterop:jsinterop-annotations:2.0.0",
+          "com.beust:jcommander:1.82",
+          "commons-collections:commons-collections:3.2.2",
+          "commons-codec:commons-codec:1.10",
+          "commons-io:commons-io:2.4",
+          "net.bytebuddy:byte-buddy:1.12.21",
+          "org.ow2.asm:asm:7.1",
+          "org.ow2.asm:asm-commons:7.1",
+          "org.ow2.asm:asm-tree:7.1",
+          "org.ow2.asm:asm-analysis:7.1",
+          "org.eclipse.jetty:jetty-util:9.2.14.v20151106",
+          "org.eclipse.jetty:jetty-io:9.2.14.v20151106",
+          "org.eclipse.jetty:jetty-server:9.2.14.v20151106",
+          "org.eclipse.jetty:jetty-http:9.2.14.v20151106",
+          "org.eclipse.jetty:jetty-servlet:9.2.14.v20151106",
+          "org.jetbrains.kotlin:kotlin-stdlib:1.7.0",
+          "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.0",
+          "xml-apis:xml-apis:1.4.01"
+    }
+  }
+
+  configurations {
+    implementation.exclude module: "cglib"
+    implementation.exclude module: "apache-jsp"
+    implementation.exclude group: "org.eclipse.jetty.orbit"
+  }
+
+  dependencies {
+    // Google Web Toolkit
+    implementation "com.google.gwt:gwt-user:2.10.0"
+    implementation "com.google.guava:guava-gwt:31.1-jre"
+    // https://github.com/google/elemental2
+    implementation "com.google.elemental2:elemental2-dom:1.1.0"
+    implementation "com.google.jsinterop:base:1.0.0"
+
+    // JSON
+    implementation 'com.github.nmorel.gwtjackson:gwt-jackson:0.15.4'
+
+    // FindBugs annotations
+    implementation "com.google.code.findbugs:annotations:3.0.1"
+    implementation "com.google.code.findbugs:jsr305:3.0.1"
+
+    // test dependencies
+    testImplementation "javax.json:javax.json-api:1.0"
+    testImplementation "org.glassfish:javax.json:1.0.4"
+    testImplementation "commons-io:commons-io:2.4"
+
+    testImplementation("org.assertj:assertj-core:3.24.2")
+    testImplementation "org.mockito:mockito-core:2.8.9"
+    testImplementation "org.testng:testng:6.11"
+  }
+
+  release {
+    git {
+      requireBranch.set("master")
+    }
+  }
+
+  tasks.withType(JavaCompile) {
+    options.sourcepath = null
+  }
+
+  javadoc {
+    // Avoid error: cannot access external classes
+    options.addStringOption("sourcepath", "")
+
+    if (JavaVersion.current().isJava9Compatible()) {
+      options.addBooleanOption('html5', true)
+    }
+  }
+
+  java {
+    withJavadocJar()
+    withSourcesJar()
+  }
+
+  artifacts {
+    archives sourcesJar
+    archives javadocJar
+  }
+
+  jar.doFirst {
+    sourceSets.main.java.srcDirs.each {
+      from it
+    }
+  }
+
+  jar {
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
+  }
+
+  sourcesJar {
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
+  }
+
+  processResources {
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
+  }
+}
+
+build {
+  doFirst {
+    delete "out"
+  }
+}

gradle.properties

@@ -0,0 +1 @@
+version = 1.0.66

gwt-uploader/gradle/wrapper/gradle-wrapper.properties → gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun Jun 11 10:11:27 AWST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-bin.zip