From 8280f63c62cc9b4013be3a7964fa1a5e93148c8a Mon Sep 17 00:00:00 2001 From: Jeff Lockhart Date: Fri, 9 Feb 2024 10:16:31 -0700 Subject: [PATCH] Consolidate license attributions --- .../kotbase/ktx/ReplicatorExtensions.android.kt | 1 + .../kotlin/kotbase/ktx/DocumentExtensions.kt | 16 +--------------- .../kotlin/kotbase/ktx/QueryBuilderExtensions.kt | 16 +--------------- .../kotlin/kotbase/ktx/QueryExtensions.kt | 16 +--------------- .../kotlin/kotbase/ktx/ResultSetExtensions.kt | 16 +--------------- .../kotbase/ktx/DocumentExtensionsKtTest.kt | 2 +- .../kotbase/ktx/QueryBuilderExtensionsKtTest.kt | 1 + .../kotlin/kotbase/ktx/QueryExtensionsKtTest.kt | 1 + .../androidx/paging/AsyncPagingDataDiffer.kt | 3 ++- .../androidx/paging/NullPaddedListDiffHelper.kt | 3 ++- 10 files changed, 12 insertions(+), 63 deletions(-) diff --git a/couchbase-lite-ktx/src/androidMain/kotlin/kotbase/ktx/ReplicatorExtensions.android.kt b/couchbase-lite-ktx/src/androidMain/kotlin/kotbase/ktx/ReplicatorExtensions.android.kt index 2521e1c64..0c713c741 100644 --- a/couchbase-lite-ktx/src/androidMain/kotlin/kotbase/ktx/ReplicatorExtensions.android.kt +++ b/couchbase-lite-ktx/src/androidMain/kotlin/kotbase/ktx/ReplicatorExtensions.android.kt @@ -1,5 +1,6 @@ /* * Copyright (c) 2020 MOLO17 + * Copyright 2022-2023 Jeff Lockhart * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/couchbase-lite-ktx/src/commonMain/kotlin/kotbase/ktx/DocumentExtensions.kt b/couchbase-lite-ktx/src/commonMain/kotlin/kotbase/ktx/DocumentExtensions.kt index 9ea581850..cd2fc5c57 100644 --- a/couchbase-lite-ktx/src/commonMain/kotlin/kotbase/ktx/DocumentExtensions.kt +++ b/couchbase-lite-ktx/src/commonMain/kotlin/kotbase/ktx/DocumentExtensions.kt @@ -1,26 +1,12 @@ /* * Copyright (c) 2020 MOLO17 - * - * 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. - */ -/* * Copyright 2022-2023 Jeff Lockhart * * 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 + * 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, diff --git a/couchbase-lite-ktx/src/commonMain/kotlin/kotbase/ktx/QueryBuilderExtensions.kt b/couchbase-lite-ktx/src/commonMain/kotlin/kotbase/ktx/QueryBuilderExtensions.kt index 37a25acfc..d61d61a49 100644 --- a/couchbase-lite-ktx/src/commonMain/kotlin/kotbase/ktx/QueryBuilderExtensions.kt +++ b/couchbase-lite-ktx/src/commonMain/kotlin/kotbase/ktx/QueryBuilderExtensions.kt @@ -1,26 +1,12 @@ /* * Copyright (c) 2020 MOLO17 - * - * 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. - */ -/* * Copyright 2022-2023 Jeff Lockhart * * 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 + * 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, diff --git a/couchbase-lite-ktx/src/commonMain/kotlin/kotbase/ktx/QueryExtensions.kt b/couchbase-lite-ktx/src/commonMain/kotlin/kotbase/ktx/QueryExtensions.kt index ce1a61737..5b8623383 100644 --- a/couchbase-lite-ktx/src/commonMain/kotlin/kotbase/ktx/QueryExtensions.kt +++ b/couchbase-lite-ktx/src/commonMain/kotlin/kotbase/ktx/QueryExtensions.kt @@ -1,26 +1,12 @@ /* * Copyright (c) 2020 MOLO17 - * - * 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. - */ -/* * Copyright 2022-2023 Jeff Lockhart * * 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 + * 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, diff --git a/couchbase-lite-ktx/src/commonMain/kotlin/kotbase/ktx/ResultSetExtensions.kt b/couchbase-lite-ktx/src/commonMain/kotlin/kotbase/ktx/ResultSetExtensions.kt index 02b82b92e..62cf2317e 100644 --- a/couchbase-lite-ktx/src/commonMain/kotlin/kotbase/ktx/ResultSetExtensions.kt +++ b/couchbase-lite-ktx/src/commonMain/kotlin/kotbase/ktx/ResultSetExtensions.kt @@ -1,26 +1,12 @@ /* * Copyright (c) 2020 MOLO17 - * - * 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. - */ -/* * Copyright 2022-2023 Jeff Lockhart * * 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 + * 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, diff --git a/couchbase-lite-ktx/src/commonTest/kotlin/kotbase/ktx/DocumentExtensionsKtTest.kt b/couchbase-lite-ktx/src/commonTest/kotlin/kotbase/ktx/DocumentExtensionsKtTest.kt index ac22b2ede..bcaca6b8c 100644 --- a/couchbase-lite-ktx/src/commonTest/kotlin/kotbase/ktx/DocumentExtensionsKtTest.kt +++ b/couchbase-lite-ktx/src/commonTest/kotlin/kotbase/ktx/DocumentExtensionsKtTest.kt @@ -1,5 +1,6 @@ /* * Copyright (c) 2020 MOLO17 + * Copyright 2022-2023 Jeff Lockhart * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,7 +25,6 @@ package kotbase.ktx import kotbase.BaseTest -import kotbase.Database import kotbase.ext.nowMillis import kotlinx.datetime.Clock import kotlin.test.Test diff --git a/couchbase-lite-ktx/src/commonTest/kotlin/kotbase/ktx/QueryBuilderExtensionsKtTest.kt b/couchbase-lite-ktx/src/commonTest/kotlin/kotbase/ktx/QueryBuilderExtensionsKtTest.kt index 6f6ddefe7..fe62cd645 100644 --- a/couchbase-lite-ktx/src/commonTest/kotlin/kotbase/ktx/QueryBuilderExtensionsKtTest.kt +++ b/couchbase-lite-ktx/src/commonTest/kotlin/kotbase/ktx/QueryBuilderExtensionsKtTest.kt @@ -1,5 +1,6 @@ /* * Copyright (c) 2020 MOLO17 + * Copyright 2022-2023 Jeff Lockhart * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/couchbase-lite-ktx/src/jvmCommonTest/kotlin/kotbase/ktx/QueryExtensionsKtTest.kt b/couchbase-lite-ktx/src/jvmCommonTest/kotlin/kotbase/ktx/QueryExtensionsKtTest.kt index 3eafd9e87..337ef655e 100644 --- a/couchbase-lite-ktx/src/jvmCommonTest/kotlin/kotbase/ktx/QueryExtensionsKtTest.kt +++ b/couchbase-lite-ktx/src/jvmCommonTest/kotlin/kotbase/ktx/QueryExtensionsKtTest.kt @@ -1,5 +1,6 @@ /* * Copyright (c) 2020 MOLO17 + * Copyright 2022-2023 Jeff Lockhart * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/couchbase-lite-paging/src/commonTest/kotlin/androidx/paging/AsyncPagingDataDiffer.kt b/couchbase-lite-paging/src/commonTest/kotlin/androidx/paging/AsyncPagingDataDiffer.kt index 561eaa43e..7cb5fd4a9 100644 --- a/couchbase-lite-paging/src/commonTest/kotlin/androidx/paging/AsyncPagingDataDiffer.kt +++ b/couchbase-lite-paging/src/commonTest/kotlin/androidx/paging/AsyncPagingDataDiffer.kt @@ -1,5 +1,6 @@ /* * Copyright 2019 The Android Open Source Project + * Copyright 2022-2023 Jeff Lockhart * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +16,7 @@ */ /* - * Copied from https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:paging/paging-runtime/src/main/java/androidx/paging/AsyncPagingDataDiffer.kt + * From https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:paging/paging-runtime/src/main/java/androidx/paging/AsyncPagingDataDiffer.kt * Modified by Jeff Lockhart * - Use Multiplatform Paging * - Replace JVM AtomicInteger diff --git a/couchbase-lite-paging/src/commonTest/kotlin/androidx/paging/NullPaddedListDiffHelper.kt b/couchbase-lite-paging/src/commonTest/kotlin/androidx/paging/NullPaddedListDiffHelper.kt index 1048035c0..25292c06b 100644 --- a/couchbase-lite-paging/src/commonTest/kotlin/androidx/paging/NullPaddedListDiffHelper.kt +++ b/couchbase-lite-paging/src/commonTest/kotlin/androidx/paging/NullPaddedListDiffHelper.kt @@ -1,5 +1,6 @@ /* * Copyright (C) 2017 The Android Open Source Project + * Copyright 2022-2023 Jeff Lockhart * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +16,7 @@ */ /* - * Copied from https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:paging/paging-runtime/src/main/java/androidx/paging/NullPaddedListDiffHelper.kt + * From https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:paging/paging-runtime/src/main/java/androidx/paging/NullPaddedListDiffHelper.kt * Modified by Jeff Lockhart * - Use Multiplatform Paging */