From 4392ddae6f87e6d69522607d85ee83e78960c806 Mon Sep 17 00:00:00 2001
From: Matthew de Detrich <matthew.dedetrich@aiven.io>
Date: Thu, 2 Nov 2023 08:58:02 +0100
Subject: [PATCH] Update sbt versions in README.md

---
 .github/workflows/ci.yml | 18 +-----------------
 README.md                |  2 +-
 build.sbt                |  8 ++++++--
 3 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5eee15d..243a0ed 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,7 +24,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
         scala: [2.12.18]
-        java: [temurin@8, temurin@11, temurin@17, temurin@21]
+        java: [temurin@8, temurin@11, temurin@17]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Ignore line ending differences in git
@@ -68,14 +68,6 @@ jobs:
           java-version: 17
           cache: sbt
 
-      - name: Setup Java (temurin@21)
-        if: matrix.java == 'temurin@21'
-        uses: actions/setup-java@v3
-        with:
-          distribution: temurin
-          java-version: 21
-          cache: sbt
-
       - name: Check that workflows are up to date
         shell: bash
         run: sbt '++ ${{ matrix.scala }}' githubWorkflowCheck
@@ -144,14 +136,6 @@ jobs:
           java-version: 17
           cache: sbt
 
-      - name: Setup Java (temurin@21)
-        if: matrix.java == 'temurin@21'
-        uses: actions/setup-java@v3
-        with:
-          distribution: temurin
-          java-version: 21
-          cache: sbt
-
       - name: Download target directories (2.12.18)
         uses: actions/download-artifact@v3
         with:
diff --git a/README.md b/README.md
index 6664801..2bf7676 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ sbt-osgi is a plugin for sbt. In order to install sbt, please refer to the sbt d
 - sbt-osgi 0.5 → sbt 0.12
 - sbt-osgi 0.7 → sbt 0.13
 - sbt-osgi 0.9.{0-3} → sbt 0.13 / sbt 1.x
-- sbt-osgi 0.9.{4-5} -> sbt 1.x
+- sbt-osgi 0.9.{4-x} -> sbt 1.6.2+ (older versions of sbt may work but 1.6.2+ supports all JDK LTS versions)
 
 As sbt-osgi is a plugin for sbt, it is installed like any other sbt plugin, that is by mere configuration: just add sbt-osgi to your global or local plugin definition. Global plugins are defined in `~/.sbt/<SBT_VERSION>/plugins/plugins.sbt` and local plugins are defined in `project/plugins.sbt` in your project.
 
diff --git a/build.sbt b/build.sbt
index 1a9d4f3..822254c 100644
--- a/build.sbt
+++ b/build.sbt
@@ -45,8 +45,7 @@ ThisBuild / githubWorkflowOSes := Seq("ubuntu-latest", "macos-latest", "windows-
 ThisBuild / githubWorkflowJavaVersions := Seq(
   JavaSpec.temurin("8"),
   JavaSpec.temurin("11"),
-  JavaSpec.temurin("17"),
-  JavaSpec.temurin("21")
+  JavaSpec.temurin("17")
 )
 
 name := "sbt-osgi"
@@ -58,6 +57,11 @@ scalacOptions ++= Seq(
   "-Xlint",
   "-encoding", "UTF-8"
 )
+(pluginCrossBuild / sbtVersion) := {
+  scalaBinaryVersion.value match {
+    case "2.12" => "1.6.2"
+  }
+}
 scriptedLaunchOpts += "-Xmx1024m"
 scriptedLaunchOpts ++= Seq("-Dplugin.version=" + version.value)
 scriptedLaunchOpts += "-debug"