Skip to content

Commit b6a9d0d

Browse files
authored
Update airframe-log to 2025.1.16 (#686)
1 parent e6a318d commit b6a9d0d

File tree

1 file changed

+80
-56
lines changed

1 file changed

+80
-56
lines changed

build.sbt

Lines changed: 80 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,31 @@ description := "snappy-java: A fast compression/decompression library"
77

88
ThisBuild / publishTo := {
99
val centralSnapshots = "https://central.sonatype.com/repository/maven-snapshots/"
10-
if (isSnapshot.value) Some("central-snapshots" at centralSnapshots)
11-
else localStaging.value
10+
if (isSnapshot.value)
11+
Some("central-snapshots" at centralSnapshots)
12+
else
13+
localStaging.value
1214
}
13-
licenses := Seq("Apache-2.0" -> url("https://www.apache.org/licenses/LICENSE-2.0.html"))
14-
homepage := Some(url("https://github.com/xerial/snappy-java"))
15-
scmInfo := Some(
16-
ScmInfo(
17-
browseUrl = url("https://github.com/xerial/snappy-java"),
18-
connection = "scm:git@github.com:xerial/snappy-java.git"
15+
16+
licenses := Seq("Apache-2.0" -> url("https://www.apache.org/licenses/LICENSE-2.0.html"))
17+
homepage := Some(url("https://github.com/xerial/snappy-java"))
18+
scmInfo :=
19+
Some(
20+
ScmInfo(
21+
browseUrl = url("https://github.com/xerial/snappy-java"),
22+
connection = "scm:git@github.com:xerial/snappy-java.git"
23+
)
24+
)
25+
26+
developers :=
27+
List(
28+
Developer(
29+
id = "leo",
30+
name = "Taro L. Saito",
31+
email = "leo@xerial.org",
32+
url = url("http://xerial.org/leo")
33+
)
1934
)
20-
)
21-
developers := List(
22-
Developer(id = "leo", name = "Taro L. Saito", email = "leo@xerial.org", url = url("http://xerial.org/leo"))
23-
)
2435

2536
// Use dynamic snapshot version strings for non tagged versions
2637
ThisBuild / dynverSonatypeSnapshots := true
@@ -38,7 +49,9 @@ ThisBuild / javacOptions ++= {
3849
Seq.empty
3950
}
4051
}
41-
Compile / compile / javacOptions ++= Seq("-encoding", "UTF-8", "-Xlint:unchecked", "-Xlint:deprecation")
52+
53+
Compile / compile / javacOptions ++=
54+
Seq("-encoding", "UTF-8", "-Xlint:unchecked", "-Xlint:deprecation")
4255

4356
doc / javacOptions := {
4457
val opts = Seq("-source", "1.8")
@@ -66,63 +79,74 @@ val linuxLibPath = s"$libTemp:${System.getenv("LD_LIBRARY_PATH")}"
6679

6780
// have to add to system dynamic library path since hadoop native library indirectly load libsnappy.1
6881
// can't use javaOptions in Test because it causes the expression to eval twice yielding different temp path values
69-
Test / envVars := Map("XERIAL_SNAPPY_LIB" -> libTemp, "DYLD_LIBRARY_PATH" -> macOSXLibPath, "LD_LIBRARY_PATH" -> linuxLibPath)
82+
Test / envVars :=
83+
Map(
84+
"XERIAL_SNAPPY_LIB" -> libTemp,
85+
"DYLD_LIBRARY_PATH" -> macOSXLibPath,
86+
"LD_LIBRARY_PATH" -> linuxLibPath
87+
)
7088

7189
testOptions += Tests.Argument(TestFrameworks.JUnit, "-q", "-v")
7290
Test / parallelExecution := false
7391

7492
autoScalaLibrary := false
7593
crossPaths := false
7694

77-
libraryDependencies ++= Seq(
78-
"junit" % "junit" % "4.13.2" % "test",
79-
"org.codehaus.plexus" % "plexus-classworlds" % "2.9.0" % "test",
80-
"org.xerial.java" % "xerial-core" % "2.1" % "test",
81-
"org.wvlet.airframe" %% "airframe-log" % "2025.1.14" % "test",
82-
"org.osgi" % "org.osgi.core" % "6.0.0" % "provided",
83-
"com.github.sbt" % "junit-interface" % "0.13.3" % "test",
84-
"org.apache.hadoop" % "hadoop-common" % "3.4.1" % "test" exclude ("org.xerial.snappy", "snappy-java")
85-
)
95+
libraryDependencies ++=
96+
Seq(
97+
"junit" % "junit" % "4.13.2" % "test",
98+
"org.codehaus.plexus" % "plexus-classworlds" % "2.9.0" % "test",
99+
"org.xerial.java" % "xerial-core" % "2.1" % "test",
100+
"org.wvlet.airframe" %% "airframe-log" % "2025.1.16" % "test",
101+
"org.osgi" % "org.osgi.core" % "6.0.0" % "provided",
102+
"com.github.sbt" % "junit-interface" % "0.13.3" % "test",
103+
"org.apache.hadoop" % "hadoop-common" % "3.4.1" % "test" exclude
104+
("org.xerial.snappy", "snappy-java")
105+
)
86106

87107
enablePlugins(SbtOsgi)
88108

89109
osgiSettings
90110

91-
OsgiKeys.exportPackage := Seq("org.xerial.snappy", "org.xerial.snappy.buffer", "org.xerial.snappy.pool")
111+
OsgiKeys.exportPackage :=
112+
Seq("org.xerial.snappy", "org.xerial.snappy.buffer", "org.xerial.snappy.pool")
113+
92114
OsgiKeys.bundleSymbolicName := "org.xerial.snappy.snappy-java"
93115
OsgiKeys.bundleActivator := Option("org.xerial.snappy.SnappyBundleActivator")
94116
OsgiKeys.importPackage := Seq("""org.osgi.framework;version="[1.5,2)"""")
95117
OsgiKeys.requireCapability := """osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.7))""""
96118

97-
OsgiKeys.additionalHeaders := Map(
98-
"Bundle-NativeCode" -> Seq(
99-
"org/xerial/snappy/native/Windows/x86_64/snappyjava.dll;osname=win32;processor=x86-64",
100-
"org/xerial/snappy/native/Windows/x86_64/snappyjava.dll;osname=win32;processor=x64",
101-
"org/xerial/snappy/native/Windows/x86_64/snappyjava.dll;osname=win32;processor=amd64",
102-
"org/xerial/snappy/native/Windows/x86/snappyjava.dll;osname=win32;processor=x86",
103-
"org/xerial/snappy/native/Mac/x86/libsnappyjava.jnilib;osname=macosx;processor=x86",
104-
"org/xerial/snappy/native/Mac/x86_64/libsnappyjava.dylib;osname=macosx;processor=x86-64",
105-
"org/xerial/snappy/native/Mac/aarch64/libsnappyjava.dylib;osname=macosx;processor=aarch64",
106-
"org/xerial/snappy/native/Linux/x86_64/libsnappyjava.so;osname=linux;processor=x86-64",
107-
"org/xerial/snappy/native/Linux/x86_64/libsnappyjava.so;osname=linux;processor=x64",
108-
"org/xerial/snappy/native/Linux/x86_64/libsnappyjava.so;osname=linux;processor=amd64",
109-
"org/xerial/snappy/native/Linux/x86/libsnappyjava.so;osname=linux;processor=x86",
110-
"org/xerial/snappy/native/Linux/aarch64/libsnappyjava.so;osname=linux;processor=aarch64",
111-
"org/xerial/snappy/native/Linux/riscv64/libsnappyjava.so;osname=linux;processor=riscv64",
112-
"org/xerial/snappy/native/Linux/arm/libsnappyjava.so;osname=linux;processor=arm",
113-
"org/xerial/snappy/native/Linux/armv7/libsnappyjava.so;osname=linux;processor=arm_le",
114-
"org/xerial/snappy/native/Linux/ppc64/libsnappyjava.so;osname=linux;processor=ppc64le",
115-
"org/xerial/snappy/native/Linux/s390x/libsnappyjava.so;osname=linux;processor=s390x",
116-
"org/xerial/snappy/native/Linux/loongarch64/libsnappyjava.so;osname=linux;processor=loongarch64",
117-
"org/xerial/snappy/native/Linux/x86_64-musl/libsnappyjava.so;osname=linux;processor=x86-64",
118-
"org/xerial/snappy/native/AIX/ppc/libsnappyjava.a;osname=aix;processor=ppc",
119-
"org/xerial/snappy/native/AIX/ppc64/libsnappyjava.a;osname=aix;processor=ppc64",
120-
"org/xerial/snappy/native/SunOS/x86/libsnappyjava.so;osname=sunos;processor=x86",
121-
"org/xerial/snappy/native/SunOS/x86_64/libsnappyjava.so;osname=sunos;processor=x86-64",
122-
"org/xerial/snappy/native/SunOS/sparc/libsnappyjava.so;osname=sunos;processor=sparc"
123-
).mkString(","),
124-
"Bundle-DocURL" -> "http://www.xerial.org/",
125-
"Bundle-License" -> "http://www.apache.org/licenses/LICENSE-2.0.txt",
126-
"Bundle-ActivationPolicy" -> "lazy",
127-
"Bundle-Name" -> "snappy-java: A fast compression/decompression library"
128-
)
119+
OsgiKeys.additionalHeaders :=
120+
Map(
121+
"Bundle-NativeCode" ->
122+
Seq(
123+
"org/xerial/snappy/native/Windows/x86_64/snappyjava.dll;osname=win32;processor=x86-64",
124+
"org/xerial/snappy/native/Windows/x86_64/snappyjava.dll;osname=win32;processor=x64",
125+
"org/xerial/snappy/native/Windows/x86_64/snappyjava.dll;osname=win32;processor=amd64",
126+
"org/xerial/snappy/native/Windows/x86/snappyjava.dll;osname=win32;processor=x86",
127+
"org/xerial/snappy/native/Mac/x86/libsnappyjava.jnilib;osname=macosx;processor=x86",
128+
"org/xerial/snappy/native/Mac/x86_64/libsnappyjava.dylib;osname=macosx;processor=x86-64",
129+
"org/xerial/snappy/native/Mac/aarch64/libsnappyjava.dylib;osname=macosx;processor=aarch64",
130+
"org/xerial/snappy/native/Linux/x86_64/libsnappyjava.so;osname=linux;processor=x86-64",
131+
"org/xerial/snappy/native/Linux/x86_64/libsnappyjava.so;osname=linux;processor=x64",
132+
"org/xerial/snappy/native/Linux/x86_64/libsnappyjava.so;osname=linux;processor=amd64",
133+
"org/xerial/snappy/native/Linux/x86/libsnappyjava.so;osname=linux;processor=x86",
134+
"org/xerial/snappy/native/Linux/aarch64/libsnappyjava.so;osname=linux;processor=aarch64",
135+
"org/xerial/snappy/native/Linux/riscv64/libsnappyjava.so;osname=linux;processor=riscv64",
136+
"org/xerial/snappy/native/Linux/arm/libsnappyjava.so;osname=linux;processor=arm",
137+
"org/xerial/snappy/native/Linux/armv7/libsnappyjava.so;osname=linux;processor=arm_le",
138+
"org/xerial/snappy/native/Linux/ppc64/libsnappyjava.so;osname=linux;processor=ppc64le",
139+
"org/xerial/snappy/native/Linux/s390x/libsnappyjava.so;osname=linux;processor=s390x",
140+
"org/xerial/snappy/native/Linux/loongarch64/libsnappyjava.so;osname=linux;processor=loongarch64",
141+
"org/xerial/snappy/native/Linux/x86_64-musl/libsnappyjava.so;osname=linux;processor=x86-64",
142+
"org/xerial/snappy/native/AIX/ppc/libsnappyjava.a;osname=aix;processor=ppc",
143+
"org/xerial/snappy/native/AIX/ppc64/libsnappyjava.a;osname=aix;processor=ppc64",
144+
"org/xerial/snappy/native/SunOS/x86/libsnappyjava.so;osname=sunos;processor=x86",
145+
"org/xerial/snappy/native/SunOS/x86_64/libsnappyjava.so;osname=sunos;processor=x86-64",
146+
"org/xerial/snappy/native/SunOS/sparc/libsnappyjava.so;osname=sunos;processor=sparc"
147+
).mkString(","),
148+
"Bundle-DocURL" -> "http://www.xerial.org/",
149+
"Bundle-License" -> "http://www.apache.org/licenses/LICENSE-2.0.txt",
150+
"Bundle-ActivationPolicy" -> "lazy",
151+
"Bundle-Name" -> "snappy-java: A fast compression/decompression library"
152+
)

0 commit comments

Comments
 (0)