continue

Signed-off-by: 梦境迷离 <[email protected]>
bitlap · Aug 14, 2023 · 123dd6b · 123dd6b
1 parent 0a832b4
commit 123dd6b
Show file tree

Hide file tree

Showing 100 changed files with 49 additions and 4,785 deletions.
diff --git a/.codecov.yml b/.codecov.yml
@@ -18,8 +18,4 @@ comment:
 ignore:
   - "**/package.scala"
   - "**/macros.scala"
-  - "**/LogUtils.scala"
-  - "**/ZRedisConfiguration.scala"
-  - "**/ZRedisLive.scala"
-  - "**/ZRedisService.scala"
   - "examples/**/*"
diff --git a/.gitignore b/.gitignore
@@ -20,13 +20,9 @@ examples/scala2-13/target/
 examples/scala2-11/project/target
 examples/scala2-12/project/target
 examples/scala2-13/project/target
-smt-cacheable/target
-smt-cacheable-caffeine/target
-smt-cacheable-redis/target
 smt-csv/target
 smt-csv-derive/target
 smt-annotations/target
-smt-cache/target
 smt-common/target
 
 .run/
diff --git a/README.md b/README.md
@@ -1,17 +1,16 @@
 # smt
 
-| CI              | Codecov                                   |
-|-----------------|-------------------------------------------|
-| ![CI][Badge-CI] | [![codecov][Badge-Codecov]][Link-Codecov] |
+| CI              | Codecov                                   | Scaladex                                                      | Jetbrains Plugin                              |
+|-----------------|-------------------------------------------|---------------------------------------------------------------|-----------------------------------------------|
+| ![CI][Badge-CI] | [![codecov][Badge-Codecov]][Link-Codecov] | [![smt Scala version support][Badge-Scaladex]][Link-Scaladex] | [![Version][Badge-Jetbrains]][Link-Jetbrains] | 
 
-| Scaladex                                                      | Jetbrains Plugin                              |
-|---------------------------------------------------------------|-----------------------------------------------|
-| [![smt Scala version support][Badge-Scaladex]][Link-Scaladex] | [![Version][Badge-Jetbrains]][Link-Jetbrains] |
 
 # 环境
 
-- Java 8+
-- Scala 2.11.12、2.12.16、2.13.8 => Scala3版本 [bitlap/rolls](https://github.com/bitlap/rolls)
+- Scala 2.11.12
+- Scala 2.12.16
+- Scala 2.13.8 
+- Scala3版本 [bitlap/rolls](https://github.com/bitlap/rolls)
 
 # 文档
 
@@ -23,13 +22,6 @@
 
 > 在gradle，maven中，通常`smt-annotations`被替换为`smt-annotations_2.12`，其中，`2.12`表示Scala版本号。
 
-## cache
-
-- 统一缓存API，缓存适配器（零依赖，类型安全）。
-```scala
-"org.bitlap" %% "smt-cache" % "<VERSION>"
-```
-
 ## common
 
 - 通用的宏操作API的封装。
@@ -40,31 +32,13 @@
 "org.bitlap" %% "smt-common" % "<VERSION>"
 ```
 
-## csv
-
-- CSV/TSV文件读写工具（零依赖，类型安全）。
-
-```scala
-"org.bitlap" %% "smt-csv" % "<VERSION>" 
-```
-
-## csv-derive
-
-- 自动派生CSV/TSV文件读写工具。
-
-```scala
-"org.bitlap" %% "smt-csv-derive" % "<VERSION>" 
-```
-
 ## annotations
 
 - `@toString`
 - `@builder`
-- `@log`
 - `@apply`
 - `@constructor`
 - `@equalsAndHashCode`
-- `@elapsed`
 - `@javaCompatible`
 
 > Intellij插件 `Scala-Macro-Tools`。
@@ -95,7 +69,7 @@ This project is developed using JetBrains IDEA.
 Thanks to JetBrains for providing me with a free license, which is a strong support for me.
 
 [Badge-CI]: https://github.com/bitlap/smt/actions/workflows/ci.yml/badge.svg
-[Badge-Scaladex]: https://index.scala-lang.org/bitlap/smt/smt-annotations/latest.svg?platform=jvm
+[Badge-Scaladex]: https://index.scala-lang.org/bitlap/smt/smt-annotations/latest-by-scala-version.svg?platform=jvm
 [Badge-Jetbrains]: https://img.shields.io/jetbrains/plugin/v/17202-scala-macro-tools
 [Badge-Codecov]: https://codecov.io/gh/bitlap/smt/branch/master/graph/badge.svg?token=IA596YRTOT
 

diff --git a/build.sbt b/build.sbt
@@ -35,9 +35,6 @@ lazy val scala211 = "2.11.12"
 lazy val scala213 = "2.13.8"
 
 lazy val scalatestVersion             = "3.2.15"
-lazy val scalaLoggingVersion          = "3.9.5"
-lazy val log4jVersion                 = "2.20.0"
-lazy val scalaCollectionCompatVersion = "2.9.0"
 lazy val h2                           = "2.1.214"
 
 lazy val commonSettings =
@@ -58,23 +55,13 @@ lazy val commonSettings =
     } ++ Seq("-language:experimental.macros"),
     Compile / compile             := (Compile / compile).dependsOn(Compile / headerCreateAll).value,
     Global / onChangedBuildSource := ReloadOnSourceChanges,
-    headerLicense                 := Some(HeaderLicense.MIT("2022", "bitlap")),
+    headerLicense                 := Some(HeaderLicense.MIT("2023", "bitlap")),
     Test / testOptions += Tests.Argument("-oDF"),
     Test / fork               := true,
     publishConfiguration      := publishConfiguration.value.withOverwrite(true),
     publishLocalConfiguration := publishLocalConfiguration.value.withOverwrite(true)
   )
 
-lazy val `smt-csv` = (project in file("smt-csv"))
-  .settings(commonSettings)
-  .settings(
-    name               := "smt-csv",
-    crossScalaVersions := List(scala213, scala212, scala211)
-  )
-  .dependsOn(`smt-common` % "compile->compile;test->test")
-  .settings(paradise())
-  .enablePlugins(HeaderPlugin)
-
 lazy val `smt-common` = (project in file("smt-common"))
   .settings(commonSettings)
   .settings(
@@ -87,55 +74,25 @@ lazy val `smt-common` = (project in file("smt-common"))
   .settings(paradise())
   .enablePlugins(HeaderPlugin)
 
-lazy val `smt-cache` = (project in file("smt-cache"))
-  .settings(commonSettings)
-  .settings(
-    name                                            := "smt-cache",
-    crossScalaVersions                              := List(scala213, scala212, scala211),
-    libraryDependencies += "org.scala-lang.modules" %% "scala-collection-compat" % scalaCollectionCompatVersion
-  )
-  .settings(paradise())
-  .dependsOn(`smt-common` % "compile->compile;test->test")
-  .enablePlugins(HeaderPlugin)
-
-lazy val `smt-csv-derive` = (project in file("smt-csv-derive"))
-  .settings(commonSettings)
-  .settings(
-    name               := "smt-csv-derive",
-    crossScalaVersions := List(scala213, scala212, scala211)
-  )
-  .settings(paradise())
-  .enablePlugins(HeaderPlugin)
-  .dependsOn(`smt-csv` % "compile->compile;test->test")
-
 lazy val `smt-annotations` = (project in file("smt-annotations"))
   .settings(commonSettings)
   .settings(
     name               := "smt-annotations",
     crossScalaVersions := List(scala213, scala212, scala211),
-    libraryDependencies ++= Seq(
-      "com.typesafe.scala-logging" %% "scala-logging"    % scalaLoggingVersion,
-      "org.apache.logging.log4j"    % "log4j-api"        % log4jVersion % Test,
-      "org.apache.logging.log4j"    % "log4j-core"       % log4jVersion % Test,
-      "org.apache.logging.log4j"    % "log4j-slf4j-impl" % log4jVersion % Test
-    )
   )
   .settings(paradise())
   .enablePlugins(HeaderPlugin)
 
 lazy val `smt` = (project in file("."))
   .aggregate(
     `smt-annotations`,
-    `smt-csv`,
-    `smt-csv-derive`,
-    `smt-cache`,
     `smt-common`
   )
   .settings(
     commands ++= Commands.value,
     crossScalaVersions := Nil,
     publish / skip     := true,
-    headerLicense      := Some(HeaderLicense.MIT("2022", "bitlap"))
+    headerLicense      := Some(HeaderLicense.MIT("2023", "bitlap"))
   )
 
 def paradise(): Def.Setting[Seq[ModuleID]] =

diff --git a/smt-annotations/src/main/scala/org/bitlap/tools/apply.scala b/smt-annotations/src/main/scala/org/bitlap/tools/apply.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 bitlap
+ * Copyright (c) 2023 bitlap
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

diff --git a/smt-annotations/src/main/scala/org/bitlap/tools/builder.scala b/smt-annotations/src/main/scala/org/bitlap/tools/builder.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 bitlap
+ * Copyright (c) 2023 bitlap
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

diff --git a/smt-annotations/src/main/scala/org/bitlap/tools/constructor.scala b/smt-annotations/src/main/scala/org/bitlap/tools/constructor.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 bitlap
+ * Copyright (c) 2023 bitlap
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

diff --git a/smt-annotations/src/main/scala/org/bitlap/tools/elapsed.scala b/smt-annotations/src/main/scala/org/bitlap/tools/elapsed.scala
diff --git a/smt-annotations/src/main/scala/org/bitlap/tools/equalsAndHashCode.scala b/smt-annotations/src/main/scala/org/bitlap/tools/equalsAndHashCode.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 bitlap
+ * Copyright (c) 2023 bitlap
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

diff --git a/smt-annotations/src/main/scala/org/bitlap/tools/internal/AbstractMacroProcessor.scala b/smt-annotations/src/main/scala/org/bitlap/tools/internal/AbstractMacroProcessor.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 bitlap
+ * Copyright (c) 2023 bitlap
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

diff --git a/smt-annotations/src/main/scala/org/bitlap/tools/internal/applyMacro.scala b/smt-annotations/src/main/scala/org/bitlap/tools/internal/applyMacro.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 bitlap
+ * Copyright (c) 2023 bitlap
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

diff --git a/smt-annotations/src/main/scala/org/bitlap/tools/internal/builderMacro.scala b/smt-annotations/src/main/scala/org/bitlap/tools/internal/builderMacro.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 bitlap
+ * Copyright (c) 2023 bitlap
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

diff --git a/smt-annotations/src/main/scala/org/bitlap/tools/internal/constructorMacro.scala b/smt-annotations/src/main/scala/org/bitlap/tools/internal/constructorMacro.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 bitlap
+ * Copyright (c) 2023 bitlap
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in