Merge pull request #219 from eed3si9n/wip/org

Move to com.github.sbt organization + cross build to sbt 2.x

Author: mkurz

.github/workflows/ci.yml

@@ -2,29 +2,43 @@ name: CI
 on:
   pull_request:
   push:
-  schedule:
-  # 2am EST every Saturday
-  - cron: '0 7 * * 6'
+  # schedule:
+  # # 2am EST every Saturday
+  # - cron: '0 7 * * 6'
 jobs:
-  build_scala2_12:
-    runs-on: ubuntu-latest
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-latest
+            java: 8
+            distribution: zulu
+            jobtype: 1
+          - os: ubuntu-latest
+            java: 8
+            distribution: zulu
+            jobtype: 2
+    runs-on: ${{ matrix.os }}
     env:
+      # define Java options for both official sbt and sbt-extras
       JAVA_OPTS: -Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8
+      JVM_OPTS:  -Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
-    - name: Setup Scala
-      uses: olafurpg/setup-scala@v13
+      uses: actions/checkout@v4
+    - name: Setup JDK
+      uses: actions/setup-java@v4
       with:
-        java-version: "[email protected]"
-    - name: Coursier cache
-      uses: coursier/cache-action@v6
-    - name: Build and test
-      run: |
-        sbt -v clean scripted
-        rm -rf "$HOME/.ivy2/local" || true
-        find $HOME/Library/Caches/Coursier/v1        -name "ivydata-*.properties" -delete || true
-        find $HOME/.ivy2/cache                       -name "ivydata-*.properties" -delete || true
-        find $HOME/.cache/coursier/v1                -name "ivydata-*.properties" -delete || true
-        find $HOME/.sbt                              -name "ivydata-*.properties" -delete || true
+        distribution: "${{ matrix.distribution }}"
+        java-version: "${{ matrix.java }}"
+        cache: sbt
+    - uses: sbt/setup-sbt@v1
+    - name: Build and test (sbt 1.x)
+      if: ${{ matrix.jobtype == 1 }}
       shell: bash
+      run: sbt -v '++ 2.12.x' clean test scripted
+    - name: Build and test (sbt 2.x)
+      if: ${{ matrix.jobtype == 2 }}
+      shell: bash
+      run: sbt -v '++ 3.x' clean test scripted

.github/workflows/release.yml

@@ -7,21 +7,30 @@ jobs:
   build:
     runs-on: ubuntu-latest
     env:
+      # define Java options for both official sbt and sbt-extras
       JAVA_OPTS: -Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8
+      JVM_OPTS:  -Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: Setup Scala
       uses: olafurpg/setup-scala@v13
       with:
         java-version: "[email protected]"
+    - name: Setup JDK
+      uses: actions/setup-java@v4
+      with:
+        distribution: temurin
+        java-version: 8
+        cache: sbt
+    - uses: sbt/setup-sbt@v1
     - name: Release
       env:
         SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
         SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
         PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
         PGP_SECRET: ${{ secrets.PGP_SECRET }}
         CI_CLEAN: clean
-        CI_RELEASE: publishSigned
+        CI_RELEASE: +publishSigned
       run: |
         sbt ci-release

CODE_OF_CONDUCT.md

@@ -13,7 +13,7 @@ and this [maven plugin](https://github.com/revelc/formatter-maven-plugin), thoug
 Add the plugin to `project/plugins.sbt`:
 
 ```scala
-addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % --latest version---)
+addSbtPlugin("com.github.sbt" % "sbt-java-formatter" % --latest version---)
 ```
 
 For available versions see [releases](https://github.com/sbt/sbt-java-formatter/releases).
@@ -45,7 +45,7 @@ If you decide you really need more flexibility, you could consider other plugins
 
 # Contributing
 
-Yes, we'll happily accept PRs to improve the plugin. We expect you to adhere to the [Lightbend Community Code of Conduct](https://www.lightbend.com/conduct) and to sign the [Lightbend Contributor License Agreement - CLA](https://www.lightbend.com/contribute/cla).
+Yes, we'll happily accept PRs to improve the plugin.
 
 Take a look at the [contributors graph](https://github.com/sbt/sbt-java-formatter/graphs/contributors) if you want to contact
 any of the contributors directly.

README.md

@@ -1,12 +1,15 @@
+lazy val scala212 = "2.12.15"
+lazy val scala3 = "3.6.4"
+ThisBuild / scalaVersion := scala212
+ThisBuild / crossScalaVersions := Seq(scala212, scala3)
+
 lazy val sbtJavaFormatter = project.in(file(".")).aggregate(plugin).settings(publish / skip := true)
 
 lazy val plugin = project
   .in(file("plugin"))
   .enablePlugins(SbtPlugin)
+  .enablePlugins(AutomateHeaderPlugin)
   .settings(
-    organization := "com.lightbend.sbt",
-    organizationName := "Lightbend Inc.",
-    organizationHomepage := Some(url("https://lightbend.com")),
     name := "sbt-java-formatter",
     homepage := scmInfo.value.map(_.browseUrl),
     scmInfo := Some(
@@ -18,13 +21,32 @@ lazy val plugin = project
     description := "Formats Java code in your project.",
     licenses += ("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0.html")),
     publishTo := Some(if (isSnapshot.value) Opts.resolver.sonatypeSnapshots else Opts.resolver.sonatypeStaging),
-    crossSbtVersions := List("1.3.0"),
-    scalacOptions ++= Seq("-encoding", "UTF-8", "-unchecked", "-deprecation", "-feature"),
+    (pluginCrossBuild / sbtVersion) := {
+      scalaBinaryVersion.value match {
+        case "2.12" => "1.5.8"
+        case _      => "2.0.0-M4"
+      }
+    },
+    scalacOptions ++= {
+      Vector("-encoding", "UTF-8", "-unchecked", "-deprecation", "-feature") ++ (scalaBinaryVersion.value match {
+        case "2.12" => Vector("-Xsource:3")
+        case _      => Vector("-Wconf:error")
+      })
+    },
     javacOptions ++= Seq("-encoding", "UTF-8"),
     scriptedLaunchOpts := {
       scriptedLaunchOpts.value ++
       Seq("-Xmx1024M", "-Dplugin.version=" + version.value)
     },
     scriptedBufferLog := false,
-    scalafmtOnCompile := true)
-  .enablePlugins(AutomateHeaderPlugin)
+    scalafmtOnCompile := true
+  )
+
+ThisBuild / organization := "com.github.sbt"
+ThisBuild / organizationName := "sbt community"
+ThisBuild / dynverSonatypeSnapshots := true
+ThisBuild / version := {
+  val orig = (ThisBuild / version).value
+  if (orig.endsWith("-SNAPSHOT")) "0.9.0-SNAPSHOT"
+  else orig
+}

build.sbt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Lightbend Inc.
+ * Copyright 2015 sbt community
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package com.lightbend.sbt
+package com.github.sbt
 
+import _root_.sbt.Keys._
+import _root_.sbt.{ Def, _ }
 import com.google.googlejavaformat.java.JavaFormatterOptions
-import com.lightbend.sbt.javaformatter.JavaFormatter
-import sbt.Keys._
-import sbt.{ Def, _ }
+import com.github.sbt.javaformatter.JavaFormatter
 
 @deprecated("Use javafmtOnCompile setting instead", "0.5.1")
 object AutomateJavaFormatterPlugin extends AutoPlugin {
   override def trigger = allRequirements
 
   override def `requires` = plugins.JvmPlugin && JavaFormatterPlugin
 
-  override def globalSettings: Seq[Def.Setting[_]] = Seq(JavaFormatterPlugin.autoImport.javafmtOnCompile := false)
+  override def globalSettings: Seq[Def.Setting[?]] = Seq(JavaFormatterPlugin.autoImport.javafmtOnCompile := false)
 }
 
 object JavaFormatterPlugin extends AutoPlugin {
@@ -54,20 +54,24 @@ object JavaFormatterPlugin extends AutoPlugin {
 
   override def `requires` = plugins.JvmPlugin
 
-  override def projectSettings: Seq[Def.Setting[_]] = {
+  override def projectSettings: Seq[Def.Setting[?]] = {
     val anyConfigsInThisProject = ScopeFilter(configurations = inAnyConfiguration)
 
     notToBeScopedSettings ++
     Seq(Compile, Test).flatMap(inConfig(_)(toBeScopedSettings)) ++
     Seq(
-      javafmtAll := javafmt.?.all(anyConfigsInThisProject).value,
-      javafmtCheckAll := javafmtCheck.?.all(anyConfigsInThisProject).value)
+      javafmtAll := {
+        val _ = javafmt.?.all(anyConfigsInThisProject).value
+      },
+      javafmtCheckAll := {
+        val _ = javafmtCheck.?.all(anyConfigsInThisProject).value
+      })
   }
 
-  override def globalSettings: Seq[Def.Setting[_]] =
+  override def globalSettings: Seq[Def.Setting[?]] =
     Seq(javafmtOnCompile := false, javafmtStyle := JavaFormatterOptions.Style.GOOGLE)
 
-  def toBeScopedSettings: Seq[Setting[_]] =
+  def toBeScopedSettings: Seq[Setting[?]] =
     List(
       (javafmt / sourceDirectories) := List(javaSource.value),
       javafmtOptions := JavaFormatterOptions.builder().style(javafmtStyle.value).build(),
@@ -92,17 +96,17 @@ object JavaFormatterPlugin extends AutoPlugin {
       },
       javafmtDoFormatOnCompile := Def.settingDyn {
         if (javafmtOnCompile.value) {
-          javafmt in resolvedScoped.value.scope
+          resolvedScoped.value.scope / javafmt
         } else {
           Def.task(())
         }
       }.value,
       compile / compileInputs := (compile / compileInputs).dependsOn(javafmtDoFormatOnCompile).value)
 
-  def notToBeScopedSettings: Seq[Setting[_]] =
+  def notToBeScopedSettings: Seq[Setting[?]] =
     List(javafmt / includeFilter := "*.java")
 
-  private[this] val javafmtDoFormatOnCompile =
+  private val javafmtDoFormatOnCompile =
     taskKey[Unit]("Format Java source files if javafmtOnCompile is on.")
 
 }

plugin/src/main/scala/com/lightbend/sbt/JavaFormatterPlugin.scala renamed to plugin/src/main/scala/com/github/sbt/JavaFormatterPlugin.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Lightbend Inc.
+ * Copyright 2015 sbt community
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.lightbend.sbt.javaformatter
+package com.github.sbt.javaformatter
 
+import _root_.sbt.Keys._
+import _root_.sbt._
+import _root_.sbt.util.CacheImplicits._
+import _root_.sbt.util.{ CacheStoreFactory, FileInfo, Logger }
 import com.google.googlejavaformat.java.{ Formatter, JavaFormatterOptions }
-import sbt.Keys._
-import sbt._
-import sbt.util.CacheImplicits._
-import sbt.util.{ CacheStoreFactory, FileInfo, Logger }
 import scala.collection.immutable.Seq
 
 object JavaFormatter {
@@ -32,7 +32,7 @@ object JavaFormatter {
       streams: TaskStreams,
       cacheStoreFactory: CacheStoreFactory,
       options: JavaFormatterOptions): Unit = {
-    val files = sourceDirectories.descendantsExcept(includeFilter, excludeFilter).get.toList
+    val files = sourceDirectories.descendantsExcept(includeFilter, excludeFilter).get().toList
     cachedFormatSources(cacheStoreFactory, files, streams.log)(new Formatter(options))
   }
 
@@ -44,7 +44,7 @@ object JavaFormatter {
       streams: TaskStreams,
       cacheStoreFactory: CacheStoreFactory,
       options: JavaFormatterOptions): Boolean = {
-    val files = sourceDirectories.descendantsExcept(includeFilter, excludeFilter).get.toList
+    val files = sourceDirectories.descendantsExcept(includeFilter, excludeFilter).get().toList
     val analysis = cachedCheckSources(cacheStoreFactory, baseDir, files, streams.log)(new Formatter(options))
     trueOrBoom(analysis)
   }
@@ -65,9 +65,9 @@ object JavaFormatter {
 
     import sjsonnew.{ :*:, LList, LNil }
 
-    implicit val analysisIso = LList.iso(
-      { a: Analysis => ("failedCheck", a.failedCheck) :*: LNil },
-      { in: Set[File] :*: LNil =>
+    implicit val analysisIso: sjsonnew.IsoLList.Aux[Analysis, Set[File] :*: LNil] = LList.iso(
+      { (a: Analysis) => ("failedCheck", a.failedCheck) :*: LNil },
+      { (in: Set[File] :*: LNil) =>
         Analysis(in.head)
       })
   }

plugin/src/main/scala/com/lightbend/sbt/javaformatter/JavaFormatter.scala renamed to plugin/src/main/scala/com/github/sbt/javaformatter/JavaFormatter.scala

@@ -1 +1 @@
-addSbtPlugin("com.lightbend.sbt"  % "sbt-java-formatter" % System.getProperty("plugin.version"))
+addSbtPlugin("com.github.sbt"  % "sbt-java-formatter" % System.getProperty("plugin.version"))

plugin/src/sbt-test/sbt-java-formatter/aosp-style/project/build.properties

@@ -1,5 +1,5 @@
 # compile should trigger formatting
-> test:compile
+> Test/compile
 
 #$ exec echo "====== FORMATTED ======"
 #$ exec cat src/main/java/com/lightbend/BadFormatting.java