From 0b15d20c2c5ec171aba36a8346cdb57fdfdaa843 Mon Sep 17 00:00:00 2001 From: samuelgruetter Date: Fri, 6 Dec 2013 13:25:54 +0100 Subject: [PATCH 1/2] remove package rx.lang.scala.util since all its contents were removed --- .../scala/rx/lang/scala/util/package.scala | 25 ------------------- 1 file changed, 25 deletions(-) delete mode 100644 language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/util/package.scala diff --git a/language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/util/package.scala b/language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/util/package.scala deleted file mode 100644 index 45afef4a4d..0000000000 --- a/language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/util/package.scala +++ /dev/null @@ -1,25 +0,0 @@ -/** - * Copyright 2013 Netflix, Inc. - * - * 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 rx.lang.scala - -/** - * Provides [[Opening]]s, [[Closing]]s, and [[Timestamped]]. - */ -package object util { - - // rx.util.Range not needed because there's a standard Scala Range - -} From b54faa563ae0c84ee3165cf20f2d5fe06e6f1ac5 Mon Sep 17 00:00:00 2001 From: samuelgruetter Date: Fri, 6 Dec 2013 13:36:43 +0100 Subject: [PATCH 2/2] remove import rx.lang.scala.util._ --- .../rxjava-scala/src/main/scala/rx/lang/scala/Observable.scala | 1 - 1 file changed, 1 deletion(-) diff --git a/language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/Observable.scala b/language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/Observable.scala index b0a6392cb4..895e2ec672 100644 --- a/language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/Observable.scala +++ b/language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/Observable.scala @@ -75,7 +75,6 @@ trait Observable[+T] import scala.collection.Seq import scala.concurrent.duration.{Duration, TimeUnit} import rx.util.functions._ - import rx.lang.scala.util._ import rx.lang.scala.observables.BlockingObservable import ImplicitFunctionConversions._ import JavaConversions._