From 458100420a3f8f3c98f81dff06061ab59921db47 Mon Sep 17 00:00:00 2001 From: Ian Clarke Date: Mon, 16 Mar 2020 14:35:48 -0500 Subject: [PATCH] moved package, tests pass --- build.gradle | 6 +++--- src/main/kotlin/kweb/shoebox/Shoebox.kt | 8 ++++---- src/main/kotlin/kweb/shoebox/View.kt | 4 ++-- src/main/kotlin/kweb/shoebox/samples/samples.kt | 4 ++-- .../kotlin/kweb/shoebox/stores/DirectoryStore.kt | 2 +- src/main/kotlin/kweb/shoebox/stores/LmdbStore.kt | 2 +- src/main/kotlin/kweb/shoebox/stores/MemoryStore.kt | 4 ++-- src/main/kotlin/kweb/shoebox/utils.kt | 2 +- src/test/kotlin/kweb/shoebox/OrderedViewSetSpec.kt | 6 +++--- src/test/kotlin/kweb/shoebox/ShoeboxSpec.kt | 4 ++-- src/test/kotlin/kweb/shoebox/UtilsKtSpec.kt | 13 ------------- src/test/kotlin/kweb/shoebox/ViewSpec.kt | 12 ++++-------- .../kweb/shoebox/stores/DirectoryStoreSpec.kt | 4 ++-- 13 files changed, 27 insertions(+), 44 deletions(-) delete mode 100644 src/test/kotlin/kweb/shoebox/UtilsKtSpec.kt diff --git a/build.gradle b/build.gradle index 4001d58..3c0bd9e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,8 @@ -group 'io.kweb' -version '0.2.33' +group 'kweb' +version '0.2.34' buildscript { - ext.kotlin_version = '1.3.61' + ext.kotlin_version = '1.3.70' ext.dokka_version = '0.9.18' repositories { diff --git a/src/main/kotlin/kweb/shoebox/Shoebox.kt b/src/main/kotlin/kweb/shoebox/Shoebox.kt index b15082b..ec269a7 100644 --- a/src/main/kotlin/kweb/shoebox/Shoebox.kt +++ b/src/main/kotlin/kweb/shoebox/Shoebox.kt @@ -1,9 +1,9 @@ package kweb.shoebox -import io.kweb.shoebox.Source.LOCAL -import io.kweb.shoebox.View.* -import io.kweb.shoebox.View.VerifyBehavior.BLOCKING_VERIFY -import io.kweb.shoebox.stores.* +import kweb.shoebox.Source.LOCAL +import kweb.shoebox.View.* +import kweb.shoebox.View.VerifyBehavior.BLOCKING_VERIFY +import kweb.shoebox.stores.* import java.nio.file.Path import java.util.concurrent.ConcurrentHashMap import kotlin.reflect.KClass diff --git a/src/main/kotlin/kweb/shoebox/View.kt b/src/main/kotlin/kweb/shoebox/View.kt index 99b1ded..9379415 100644 --- a/src/main/kotlin/kweb/shoebox/View.kt +++ b/src/main/kotlin/kweb/shoebox/View.kt @@ -1,7 +1,7 @@ package kweb.shoebox -import io.kweb.shoebox.Source.LOCAL -import io.kweb.shoebox.View.VerifyBehavior.* +import kweb.shoebox.Source.LOCAL +import kweb.shoebox.View.VerifyBehavior.* import java.util.* import java.util.concurrent.ConcurrentHashMap import kotlin.concurrent.thread diff --git a/src/main/kotlin/kweb/shoebox/samples/samples.kt b/src/main/kotlin/kweb/shoebox/samples/samples.kt index 152d628..21ef1b8 100644 --- a/src/main/kotlin/kweb/shoebox/samples/samples.kt +++ b/src/main/kotlin/kweb/shoebox/samples/samples.kt @@ -1,7 +1,7 @@ package kweb.shoebox.samples -import io.kweb.shoebox.Shoebox -import io.kweb.shoebox.View +import kweb.shoebox.Shoebox +import kweb.shoebox.View import java.nio.file.Files /** diff --git a/src/main/kotlin/kweb/shoebox/stores/DirectoryStore.kt b/src/main/kotlin/kweb/shoebox/stores/DirectoryStore.kt index a4d7819..2700c22 100644 --- a/src/main/kotlin/kweb/shoebox/stores/DirectoryStore.kt +++ b/src/main/kotlin/kweb/shoebox/stores/DirectoryStore.kt @@ -5,7 +5,7 @@ import com.google.common.cache.* import com.google.common.cache.CacheLoader.InvalidCacheLoadException import com.google.gson.* import com.google.gson.reflect.TypeToken -import io.kweb.shoebox.* +import kweb.shoebox.* import java.net.URLDecoder import java.nio.file.* import java.nio.file.attribute.FileTime diff --git a/src/main/kotlin/kweb/shoebox/stores/LmdbStore.kt b/src/main/kotlin/kweb/shoebox/stores/LmdbStore.kt index a8aaa1a..4569b91 100644 --- a/src/main/kotlin/kweb/shoebox/stores/LmdbStore.kt +++ b/src/main/kotlin/kweb/shoebox/stores/LmdbStore.kt @@ -3,7 +3,7 @@ package kweb.shoebox.stores import com.fatboyindustrial.gsonjavatime.Converters import com.google.gson.* import com.google.gson.reflect.TypeToken -import io.kweb.shoebox.* +import kweb.shoebox.* import java.nio.file.* import java.time.* import kotlin.reflect.KClass diff --git a/src/main/kotlin/kweb/shoebox/stores/MemoryStore.kt b/src/main/kotlin/kweb/shoebox/stores/MemoryStore.kt index 4adead0..50ed139 100644 --- a/src/main/kotlin/kweb/shoebox/stores/MemoryStore.kt +++ b/src/main/kotlin/kweb/shoebox/stores/MemoryStore.kt @@ -1,7 +1,7 @@ package kweb.shoebox.stores -import io.kweb.shoebox.KeyValue -import io.kweb.shoebox.Store +import kweb.shoebox.KeyValue +import kweb.shoebox.Store import java.util.concurrent.ConcurrentHashMap /** diff --git a/src/main/kotlin/kweb/shoebox/utils.kt b/src/main/kotlin/kweb/shoebox/utils.kt index 48622da..f2cff99 100644 --- a/src/main/kotlin/kweb/shoebox/utils.kt +++ b/src/main/kotlin/kweb/shoebox/utils.kt @@ -1,7 +1,7 @@ package kweb.shoebox import com.google.gson.* -import io.kweb.shoebox.BinarySearchResult.* +import kweb.shoebox.BinarySearchResult.* import java.lang.reflect.Type import java.nio.file.* import java.time.* diff --git a/src/test/kotlin/kweb/shoebox/OrderedViewSetSpec.kt b/src/test/kotlin/kweb/shoebox/OrderedViewSetSpec.kt index 609fd64..319161d 100644 --- a/src/test/kotlin/kweb/shoebox/OrderedViewSetSpec.kt +++ b/src/test/kotlin/kweb/shoebox/OrderedViewSetSpec.kt @@ -2,9 +2,9 @@ package kweb.shoebox import io.kotlintest.matchers.* import io.kotlintest.specs.FreeSpec -import io.kweb.shoebox.data.Gender.* -import io.kweb.shoebox.data.User -import io.kweb.shoebox.stores.MemoryStore +import kweb.shoebox.data.Gender.* +import kweb.shoebox.data.User +import kweb.shoebox.stores.MemoryStore /** * Created by ian on 3/14/17. diff --git a/src/test/kotlin/kweb/shoebox/ShoeboxSpec.kt b/src/test/kotlin/kweb/shoebox/ShoeboxSpec.kt index f5c9c89..25e251d 100644 --- a/src/test/kotlin/kweb/shoebox/ShoeboxSpec.kt +++ b/src/test/kotlin/kweb/shoebox/ShoeboxSpec.kt @@ -1,10 +1,10 @@ package kweb.shoebox -import io.kweb.shoebox.stores.MemoryStore +import kweb.shoebox.stores.MemoryStore import io.kotlintest.matchers.shouldBe import io.kotlintest.matchers.shouldEqual import io.kotlintest.specs.FreeSpec -import io.kweb.shoebox.Source.LOCAL +import kweb.shoebox.Source.LOCAL import java.util.concurrent.atomic.AtomicInteger /** diff --git a/src/test/kotlin/kweb/shoebox/UtilsKtSpec.kt b/src/test/kotlin/kweb/shoebox/UtilsKtSpec.kt deleted file mode 100644 index 3e5c950..0000000 --- a/src/test/kotlin/kweb/shoebox/UtilsKtSpec.kt +++ /dev/null @@ -1,13 +0,0 @@ -package kweb.shoebox - -import io.kotlintest.specs.FreeSpec -import java.nio.file.Files - -/** - * Created by ian on 3/12/17. - */ -class UtilsKtSpec : FreeSpec() { - init { - - } -} \ No newline at end of file diff --git a/src/test/kotlin/kweb/shoebox/ViewSpec.kt b/src/test/kotlin/kweb/shoebox/ViewSpec.kt index a7881bc..90579a0 100644 --- a/src/test/kotlin/kweb/shoebox/ViewSpec.kt +++ b/src/test/kotlin/kweb/shoebox/ViewSpec.kt @@ -1,14 +1,10 @@ package kweb.shoebox -import io.kweb.shoebox.data.Gender.FEMALE -import io.kweb.shoebox.data.Gender.MALE -import io.kweb.shoebox.data.User -import io.kweb.shoebox.stores.MemoryStore -import io.kotlintest.matchers.beEmpty -import io.kotlintest.matchers.should -import io.kotlintest.matchers.shouldEqual +import io.kotlintest.matchers.* import io.kotlintest.specs.FreeSpec -import java.lang.AssertionError +import kweb.shoebox.data.Gender.* +import kweb.shoebox.data.User +import kweb.shoebox.stores.MemoryStore import java.util.concurrent.atomic.AtomicInteger /** diff --git a/src/test/kotlin/kweb/shoebox/stores/DirectoryStoreSpec.kt b/src/test/kotlin/kweb/shoebox/stores/DirectoryStoreSpec.kt index d1eba3b..35f47b9 100644 --- a/src/test/kotlin/kweb/shoebox/stores/DirectoryStoreSpec.kt +++ b/src/test/kotlin/kweb/shoebox/stores/DirectoryStoreSpec.kt @@ -2,8 +2,8 @@ package kweb.shoebox.stores import io.kotlintest.matchers.* import io.kotlintest.specs.FreeSpec -import io.kweb.shoebox.ShoeboxSpec -import io.kweb.shoebox.ShoeboxSpec.TestData +import kweb.shoebox.ShoeboxSpec +import kweb.shoebox.ShoeboxSpec.TestData import java.nio.file.Files import java.nio.file.attribute.FileTime