Merge branch 'master' into update/org.osgi.core-4.3.1

xerial · Jun 4, 2022 · 360ac43 · 360ac43
2 parents 217c379 + e4fb87e
commit 360ac43
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = 2.6.1
+version = 2.6.4
 maxColumn = 180
 style = defaultWithAlign
 optIn.breaksInsideChains = true
diff --git a/build.sbt b/build.sbt
@@ -63,8 +63,8 @@ libraryDependencies ++= Seq(
   "junit"               % "junit"              % "4.13.2"  % "test",
   "org.codehaus.plexus" % "plexus-classworlds" % "2.4"     % "test",
   "org.xerial.java"     % "xerial-core"        % "2.1"     % "test",
-  "org.wvlet.airframe" %% "airframe-log"       % "21.12.0" % "test",
-  "org.osgi"            % "org.osgi.core"      % "4.3.1"   % "provided",
+  "org.wvlet.airframe" %% "airframe-log"       % "21.12.1" % "test",
+  "org.osgi"            % "org.osgi.core"      % "4.3.0"   % "provided",
   "com.github.sbt"      % "junit-interface"    % "0.13.3"  % "test",
   "org.apache.hadoop"   % "hadoop-common"      % "2.7.3"   % "test" exclude ("org.xerial.snappy", "snappy-java")
 )

diff --git a/project/build.properties b/project/build.properties
@@ -1,2 +1,2 @@
-sbt.version=1.5.8
+sbt.version=1.6.2
 
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,5 +1,5 @@
 addSbtPlugin("com.github.sbt"   % "sbt-release"  % "1.1.0")
-addSbtPlugin("org.xerial.sbt"   % "sbt-sonatype" % "3.9.10")
+addSbtPlugin("org.xerial.sbt"   % "sbt-sonatype" % "3.9.13")
 addSbtPlugin("com.github.sbt"   % "sbt-pgp"      % "2.1.2")
 addSbtPlugin("com.typesafe.sbt" % "sbt-osgi"     % "0.9.6")
-addSbtPlugin("org.scalameta"    % "sbt-scalafmt" % "2.4.3")
+addSbtPlugin("org.scalameta"    % "sbt-scalafmt" % "2.4.6")