Bumping versions and fixing workflows (#340)

SimonJPegg · Apr 16, 2024 · c3d0074 · c3d0074
1 parent a9b155c
commit c3d0074
Show file tree

Hide file tree

Showing 9 changed files with 74 additions and 145 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -11,5 +11,6 @@ updates:
     - dependency-name: "org.antipathy:*"
     - dependency-name: "net.alchim31.maven:scala-maven-plugin:*"
     - dependency-name: "org.scala-lang.modules:scala-xml_2.13:*"
+    - dependency-name: "org.scalatest:scalatest_2.13:*"
 
 
diff --git a/.github/workflows/autoMerge.yml b/.github/workflows/autoMerge.yml
diff --git a/.github/workflows/code_coverage.yml b/.github/workflows/code_coverage.yml
@@ -10,18 +10,19 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 8
+          distribution: 'temurin'
+          java-version: 17
       - name: Cache Maven packages
         uses: actions/cache@v1
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-m2
       - name: Build with Maven
-        run: mvn clean test scoverage:report -Dversion.scala.major=2.12 -Dversion.scala.minor=.10
+        run: mvn clean test scoverage:report
       - name: upload coverage_data
         run: wget -qO - https://coverage.codacy.com/get.sh | bash
         env:

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -7,51 +7,35 @@ on:
     branches: [ master ]
 
 jobs:
-  check_coverage:
+#  check_coverage:
+#    runs-on: ubuntu-latest
+#    steps:
+#      - uses: actions/checkout@v2
+#      - name: Set up JDK 17
+#        uses: actions/setup-java@v3
+#        with:
+#          distribution: 'temurin'
+#          java-version: 17
+#      - name: Cache Maven packages
+#        uses: actions/cache@v3
+#        with:
+#          path: ~/.m2
+#          key: ${{ runner.os }}-m2
+#      - name: Check coverage
+#        run: mvn clean test scoverage:check
+  test:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 8
+          distribution: 'temurin'
+          java-version: 17
       - name: Cache Maven packages
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
           path: ~/.m2
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-m2
+          key: ${{ runner.os }}-m2
       - name: Build with Maven
-        run: mvn clean test scoverage:check -Dversion.scala.major=2.12 -Dversion.scala.minor=.12
-  test_2_12:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
-      with:
-        java-version: 8
-    - name: Cache Maven packages
-      uses: actions/cache@v1
-      with:
-        path: ~/.m2
-        key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-        restore-keys: ${{ runner.os }}-m2
-    - name: Build with Maven
-      run: mvn clean package --file pom.xml -Dversion.scala.major=2.12 -Dversion.scala.minor=.12
-  test_2_13:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
-      with:
-        java-version: 8
-    - name: Cache Maven packages
-      uses: actions/cache@v1
-      with:
-        path: ~/.m2
-        key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-        restore-keys: ${{ runner.os }}-m2
-    - name: Build with Maven
-      run: mvn clean package --file pom.xml -Dversion.scala.major=2.13 -Dversion.scala.minor=.7
+        run: mvn clean package --file pom.xml
diff --git a/.github/workflows/release_212.yml → .github/workflows/release.yml b/.github/workflows/release_212.yml → .github/workflows/release.yml
@@ -1,41 +1,41 @@
-name: Build212
+name: Build213
 
 on:
   push:
     branches:
       - master
 
 jobs:
-  release_2_12:
-    runs-on: ubuntu-18.04
+  release:
+    runs-on: ubuntu-latest
     steps:
       - name: Check out Git repository
         uses: actions/checkout@v2
       - name: Install Java and Maven
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
-          java-version: 8
+          distribution: 'temurin'
+          java-version: 17
       - name: Cache Maven packages
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
           path: ~/.m2
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-m2
+          key: ${{ runner.os }}-m2
       - name: Release Maven package
         uses: samuelmeuli/action-maven-publish@v1
         with:
           gpg_private_key: ${{ secrets.gpg_private_key }}
           gpg_passphrase: ${{ secrets.gpg_passphrase }}
           nexus_username: ${{ secrets.nexus_username }}
           nexus_password: ${{ secrets.nexus_password }}
-          maven_args: -Dversion.scala.major=2.12 -Dversion.scala.minor=.12 -Drevision=$(git show -s --format=%ct.%h)
+          maven_args: -Drevision=$(git show -s --format=%ct.%h)
       - name: tag repo
-        uses: oleksiyrudenko/gha-git-credentials@v2-latest
+        uses: oleksiyrudenko/gha-git-credentials@v2.1.1
         with:
           name: 'Ciaran Kearney'
           email: '[email protected]'
           actor: 'SimonJPegg'
           token: '${{ secrets.GITHUB_TOKEN }}'
-      - run: bash create_release.sh 2.12 .12 SimonJPegg/mvn_scalafmt "$GITHUB_TOKEN"
+      - run: bash create_release.sh 2.13 .13 SimonJPegg/mvn_scalafmt "$GITHUB_TOKEN"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/release_213.yml b/.github/workflows/release_213.yml
diff --git a/.mvn/maven.config b/.mvn/maven.config
@@ -1 +1 @@
--Dversion.scala.major=2.13 -Dversion.scala.minor=.1
+-Dversion.scala.major=2.13 -Dversion.scala.minor=.13
diff --git a/pom.xml b/pom.xml
@@ -35,37 +35,37 @@
 
     <properties>
         <revision>0.SNAPSHOT</revision>
-        <version.commonsio>2.11.0</version.commonsio>
+        <version.commonsio>2.16.0</version.commonsio>
         <version.commonslang>3.12.0</version.commonslang>
         <version.commonsvalidator>1.7</version.commonsvalidator>
         <version.java>1.8</version.java>
-        <version.maven.annotations>3.6.2</version.maven.annotations>
+        <version.maven.annotations>3.8.2</version.maven.annotations>
         <version.maven>3.6.0</version.maven>
-        <version.scala.collection.compat>2.6.0</version.scala.collection.compat>
-        <version.mockito.core>4.1.0</version.mockito.core>
+        <version.scala.collection.compat>2.10.0</version.scala.collection.compat>
+        <version.mockito.core>5.11.0</version.mockito.core>
         <version.scala.major>2.13</version.scala.major>
-        <version.scala.minor>.7</version.scala.minor>
+        <version.scala.minor>.1</version.scala.minor>
         <version.scala.xml>1.3.0</version.scala.xml>
-        <version.scalafmt.dynamic>3.2.1</version.scalafmt.dynamic>
-        <version.scalatest>3.3.0-SNAP3</version.scalatest>
+        <version.scalafmt.dynamic>3.8.1</version.scalafmt.dynamic>
+        <version.scalatest>3.2.16</version.scalatest>
 
         <version.maven.plugin.clean>3.1.0</version.maven.plugin.clean>
-        <version.maven.plugin.compiler>3.8.1</version.maven.plugin.compiler>
-        <version.maven.plugin.deploy>3.0.0-M1</version.maven.plugin.deploy>
+        <version.maven.plugin.compiler>3.13.0</version.maven.plugin.compiler>
+        <version.maven.plugin.deploy>3.1.1</version.maven.plugin.deploy>
         <version.maven.plugin.flatten>1.2.7</version.maven.plugin.flatten>
-        <version.maven.plugin.gpg>3.0.1</version.maven.plugin.gpg>
-        <version.maven.plugin.install>3.0.0-M1</version.maven.plugin.install>
+        <version.maven.plugin.gpg>3.2.2</version.maven.plugin.gpg>
+        <version.maven.plugin.install>3.1.1</version.maven.plugin.install>
         <version.maven.plugin.jar>3.2.0</version.maven.plugin.jar>
         <version.maven.plugin.javadoc>3.3.1</version.maven.plugin.javadoc>
         <version.maven.plugin.nexus.staging>1.6.8</version.maven.plugin.nexus.staging>
-        <version.maven.plugin.plugin>3.6.2</version.maven.plugin.plugin>
-        <version.maven.plugin.resources>3.2.0</version.maven.plugin.resources>
-        <version.maven.plugin.scala>4.4.0</version.maven.plugin.scala> <!-- 2.12 build failing at higher version -->
+        <version.maven.plugin.plugin>3.8.2</version.maven.plugin.plugin>
+        <version.maven.plugin.resources>3.3.1</version.maven.plugin.resources>
+        <version.maven.plugin.scala>4.8.1</version.maven.plugin.scala>
         <version.maven.plugin.scalatest>2.0.2</version.maven.plugin.scalatest>
-        <version.maven.plugin.scm>1.12.0</version.maven.plugin.scm>
-        <version.maven.plugin.scoverage>1.4.1</version.maven.plugin.scoverage>
+        <version.maven.plugin.scm>2.0.0</version.maven.plugin.scm>
+        <version.maven.plugin.scoverage>2.0.3</version.maven.plugin.scoverage>
         <version.maven.plugin.source>3.2.1</version.maven.plugin.source>
-        <version.maven.plugin.surefire>2.22.2</version.maven.plugin.surefire>
+        <version.maven.plugin.surefire>3.0.0</version.maven.plugin.surefire>
         <version.maven.plugin.versions>2.8.1</version.maven.plugin.versions>
 
         <maven.compiler.source>${version.java}</maven.compiler.source>
@@ -208,8 +208,17 @@
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>${version.maven.plugin.compiler}</version>
                     <configuration>
-                        <compilerVersion>${version.java}</compilerVersion>
+                        <source>${version.java}</source>
+                        <target>${version.java}</target>
                     </configuration>
+                    <executions>
+                        <execution>
+                            <phase>compile</phase>
+                            <goals>
+                                <goal>compile</goal>
+                            </goals>
+                        </execution>
+                    </executions>
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -220,7 +229,6 @@
                 <configuration>
                     <scalaVersion>${version.scala.major}</scalaVersion>
                     <args>
-                        <arg>-target:jvm-${version.java}</arg>
                         <arg>-deprecation</arg>
                         <arg>-feature</arg>
                     </args>
@@ -298,6 +306,9 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>${version.maven.plugin.javadoc}</version>
+                <configuration>
+                    <failOnError>false</failOnError>
+                </configuration>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>
@@ -391,6 +402,7 @@
                     <scalaVersion>${version.scala.major}${version.scala.minor}</scalaVersion>
                     <minimumCoverage>${coverage.min.percent}</minimumCoverage>
                     <failOnMinimumCoverage>${coverage.fail.below.min}</failOnMinimumCoverage>
+<!--                    <scalacPluginVersion>1.4.2</scalacPluginVersion>-->
                 </configuration>
                 <executions>
                     <execution>
@@ -410,20 +422,6 @@
             </plugin>
         </plugins>
     </build>
-    <profiles>
-        <profile>
-            <id>scala_2.11</id>
-            <activation>
-                <property>
-                    <name>version.scala.major</name>
-                    <value>2.11</value>
-                </property>
-            </activation>
-            <properties>
-                <version.java>1.7</version.java>
-            </properties>
-        </profile>
-    </profiles>
 
     <reporting>
         <plugins>

diff --git a/src/main/java/org/antipathy/mvn_scalafmt/FormatMojo.java b/src/main/java/org/antipathy/mvn_scalafmt/FormatMojo.java
@@ -16,7 +16,7 @@
 /**
  * Get the location of the config file and pass to Formatter
  */
-@Mojo(name = "format", defaultPhase = LifecyclePhase.VALIDATE, threadSafe = true)
+@Mojo(name = "format", defaultPhase = LifecyclePhase.VALIDATE)
 public class FormatMojo extends AbstractMojo {
 
     @Parameter(property = "format.configLocation")