Skip to content

Commit 4a3b57e

Browse files
committed
beginning to rm cache impls as discussed in #353
1 parent 04d770d commit 4a3b57e

File tree

12 files changed

+1
-765
lines changed

12 files changed

+1
-765
lines changed

README.md

-4
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,9 @@ A facade for the most popular cache implementations, with a simple, idiomatic Sc
99
Use ScalaCache to add caching to any Scala app with the minimum of fuss.
1010

1111
The following cache implementations are supported, and it's easy to plugin your own implementation:
12-
* Google Guava
1312
* Memcached
14-
* Ehcache
1513
* Redis
1614
* [Caffeine](https://github.com/ben-manes/caffeine)
17-
* [cache2k](https://github.com/cache2k/cache2k)
18-
* [OHC](https://github.com/snazy/ohc)
1915

2016
## Documentation
2117

build.sbt

+1-44
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,9 @@ lazy val root: Project = Project(id = "scalacache", base = file("."))
2626
.aggregate(
2727
coreJS,
2828
coreJVM,
29-
guava,
3029
memcached,
31-
ehcache,
3230
redis,
33-
cache2k,
3431
caffeine,
35-
ohc,
3632
catsEffect,
3733
scalaz72,
3834
circe,
@@ -74,31 +70,13 @@ def jvmOnlyModule(name: String) =
7470
)
7571
.dependsOn(coreJVM)
7672

77-
lazy val guava = jvmOnlyModule("guava")
78-
.settings(
79-
libraryDependencies ++= Seq(
80-
"com.google.guava" % "guava" % "28.2-jre",
81-
"com.google.code.findbugs" % "jsr305" % "3.0.2"
82-
)
83-
)
84-
8573
lazy val memcached = jvmOnlyModule("memcached")
8674
.settings(
8775
libraryDependencies ++= Seq(
8876
"net.spy" % "spymemcached" % "2.12.3"
8977
)
9078
)
9179

92-
lazy val ehcache = jvmOnlyModule("ehcache")
93-
.settings(
94-
libraryDependencies ++= Seq(
95-
"net.sf.ehcache" % "ehcache" % "2.10.6",
96-
"javax.transaction" % "jta" % "1.1"
97-
),
98-
coverageMinimum := 80,
99-
coverageFailOnMinimum := true
100-
)
101-
10280
lazy val redis = jvmOnlyModule("redis")
10381
.settings(
10482
libraryDependencies ++= Seq(
@@ -108,14 +86,6 @@ lazy val redis = jvmOnlyModule("redis")
10886
coverageFailOnMinimum := true
10987
)
11088

111-
lazy val cache2k = jvmOnlyModule("cache2k")
112-
.settings(
113-
libraryDependencies ++= Seq(
114-
"org.cache2k" % "cache2k-core" % "1.2.4.Final",
115-
"org.cache2k" % "cache2k-api" % "1.2.4.Final"
116-
)
117-
)
118-
11989
lazy val caffeine = jvmOnlyModule("caffeine")
12090
.settings(
12191
libraryDependencies ++= Seq(
@@ -126,13 +96,6 @@ lazy val caffeine = jvmOnlyModule("caffeine")
12696
coverageFailOnMinimum := true
12797
)
12898

129-
lazy val ohc = jvmOnlyModule("ohc")
130-
.settings(
131-
libraryDependencies ++= Seq(
132-
"org.caffinitas.ohc" % "ohc-core" % "0.7.0"
133-
)
134-
)
135-
13699
lazy val catsEffect = jvmOnlyModule("cats-effect")
137100
.settings(
138101
libraryDependencies ++= Seq(
@@ -173,7 +136,7 @@ lazy val circe = jvmOnlyModule("circe")
173136

174137
lazy val tests = jvmOnlyModule("tests")
175138
.settings(publishArtifact := false)
176-
.dependsOn(cache2k, caffeine, memcached, redis, ohc, catsEffect, scalaz72, circe)
139+
.dependsOn(caffeine, memcached, redis, catsEffect, scalaz72, circe)
177140

178141
lazy val doc = jvmOnlyModule("doc")
179142
.enablePlugins(MicrositesPlugin)
@@ -193,13 +156,9 @@ lazy val doc = jvmOnlyModule("doc")
193156
)
194157
.dependsOn(
195158
coreJVM,
196-
guava,
197159
memcached,
198-
ehcache,
199160
redis,
200-
cache2k,
201161
caffeine,
202-
ohc,
203162
catsEffect,
204163
scalaz72,
205164
circe
@@ -222,9 +181,7 @@ lazy val benchmarks = jvmOnlyModule("benchmarks")
222181
"-XX:-UseBiasedLocking"
223182
)
224183
)
225-
.dependsOn(cache2k)
226184
.dependsOn(caffeine)
227-
.dependsOn(ohc)
228185

229186
lazy val scalatest = "org.scalatest" %% "scalatest" % "3.0.8" % Test
230187

modules/benchmarks/src/main/scala/scalacache/benchmark/Cache2kBenchmark.scala

-62
This file was deleted.

modules/benchmarks/src/main/scala/scalacache/benchmark/OhcBenchmark.scala

-64
This file was deleted.

modules/cache2k/src/main/scala/scalacache/cache2k/Cache2kCache.scala

-59
This file was deleted.

modules/cache2k/src/test/scala/scalacache/cache2k/Cache2kCacheSpec.scala

-72
This file was deleted.

0 commit comments

Comments
 (0)