From 0a9fa473004d80514b3f1120340f82975336eff3 Mon Sep 17 00:00:00 2001 From: Andrew Valencik Date: Wed, 31 Jan 2024 12:28:14 -0500 Subject: [PATCH] Simplify build, just ignore deprecation --- .../lucene/utils/CharArraySetUtils.scala | 26 ------------------- .../lucene/utils/CharArraySetUtils.scala | 2 ++ 2 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 lucene/src/main/scala-2.13+/textmogrify/lucene/utils/CharArraySetUtils.scala rename lucene/src/main/{scala-2.12 => scala}/textmogrify/lucene/utils/CharArraySetUtils.scala (93%) diff --git a/lucene/src/main/scala-2.13+/textmogrify/lucene/utils/CharArraySetUtils.scala b/lucene/src/main/scala-2.13+/textmogrify/lucene/utils/CharArraySetUtils.scala deleted file mode 100644 index c0a0268..0000000 --- a/lucene/src/main/scala-2.13+/textmogrify/lucene/utils/CharArraySetUtils.scala +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright 2022 Pig.io - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package textmogrify.lucene.utils - -import scala.jdk.CollectionConverters._ -import org.apache.lucene.analysis.CharArraySet - -object CharArraySetUtils { - - def toSet(cs: CharArraySet): Set[String] = - cs.asScala.map(ca => String.valueOf(ca.asInstanceOf[Array[Char]])).toSet -} diff --git a/lucene/src/main/scala-2.12/textmogrify/lucene/utils/CharArraySetUtils.scala b/lucene/src/main/scala/textmogrify/lucene/utils/CharArraySetUtils.scala similarity index 93% rename from lucene/src/main/scala-2.12/textmogrify/lucene/utils/CharArraySetUtils.scala rename to lucene/src/main/scala/textmogrify/lucene/utils/CharArraySetUtils.scala index 6b366c9..70c997d 100644 --- a/lucene/src/main/scala-2.12/textmogrify/lucene/utils/CharArraySetUtils.scala +++ b/lucene/src/main/scala/textmogrify/lucene/utils/CharArraySetUtils.scala @@ -16,11 +16,13 @@ package textmogrify.lucene.utils +import scala.annotation.nowarn import scala.collection.JavaConverters._ import org.apache.lucene.analysis.CharArraySet object CharArraySetUtils { + @nowarn("cat=deprecation") def toSet(cs: CharArraySet): Set[String] = cs.asScala.map(ca => String.valueOf(ca.asInstanceOf[Array[Char]])).toSet }