Skip to content

Commit f613286

Browse files
authored
Merge pull request #411 from doo/android_ds_8.0.0
[EPIC-6085] Android DS: 8.0.0
2 parents f19d40b + 8824397 commit f613286

163 files changed

Lines changed: 4460 additions & 2767 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Libraries.txt

Lines changed: 219 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Open Source libraries used in the Scanbot SDK for Android version 7.1.2
1+
Open Source libraries used in the Scanbot SDK for Android version 8.0.0
22

33
CWAC-Camera
44

@@ -84,7 +84,7 @@ limitations under the License.
8484

8585
Kotlin Standard Library
8686

87-
Version 1.9.25
87+
Version 2.1.21
8888
(https://github.com/JetBrains/kotlin)
8989

9090
Copyright 2010-2018 JetBrains s.r.o.
@@ -154,7 +154,7 @@ limitations under the License.
154154

155155
Dagger
156156

157-
Version 2.50
157+
Version 2.56.2
158158
(https://github.com/google/dagger)
159159

160160
Copyright 2012 The Dagger Authors
@@ -484,7 +484,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
484484

485485
expected
486486

487-
Version 1.1
487+
Version 1.1.0
488488
(https://github.com/TartanLlama/expected)
489489

490490
Creative Commons Legal Code
@@ -615,7 +615,7 @@ express Statement of Purpose.
615615
flatbuffers
616616

617617
Version 2.0.6
618-
(https://github.com/google/flatbuffers/tree/master)
618+
(https://github.com/google/flatbuffers)
619619

620620

621621
Apache License
@@ -1549,7 +1549,7 @@ This work is licensed under a [Creative Commons Attribution-ShareAlike 4.0 Inter
15491549

15501550
JSON for Modern C++
15511551

1552-
Version v3.11.3
1552+
Version 3.11.3
15531553
(https://github.com/nlohmann/json)
15541554

15551555
MIT License
@@ -1959,7 +1959,7 @@ OF THIS SOFTWARE.
19591959

19601960
libzueci
19611961

1962-
Version 1.0.0
1962+
Version 1.0.1
19631963
(https://sourceforge.net/projects/libzueci/)
19641964

19651965
A simple, standalone, BSD-3-Clause C library for converting UTF-8 to/from Extended Channel Interpretations, as
@@ -2372,11 +2372,221 @@ Version 1.1.0h
23722372

23732373

23742374

2375+
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
2376+
2377+
snowflake-arctic-embed-xs
2378+
2379+
Version eadfba3b
2380+
(https://huggingface.co/Snowflake/snowflake-arctic-embed-xs/tree/main)
2381+
2382+
Apache License
2383+
Version 2.0, January 2004
2384+
http://www.apache.org/licenses/
2385+
2386+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
2387+
2388+
1. Definitions.
2389+
2390+
"License" shall mean the terms and conditions for use, reproduction,
2391+
and distribution as defined by Sections 1 through 9 of this document.
2392+
2393+
"Licensor" shall mean the copyright owner or entity authorized by
2394+
the copyright owner that is granting the License.
2395+
2396+
"Legal Entity" shall mean the union of the acting entity and all
2397+
other entities that control, are controlled by, or are under common
2398+
control with that entity. For the purposes of this definition,
2399+
"control" means (i) the power, direct or indirect, to cause the
2400+
direction or management of such entity, whether by contract or
2401+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
2402+
outstanding shares, or (iii) beneficial ownership of such entity.
2403+
2404+
"You" (or "Your") shall mean an individual or Legal Entity
2405+
exercising permissions granted by this License.
2406+
2407+
"Source" form shall mean the preferred form for making modifications,
2408+
including but not limited to software source code, documentation
2409+
source, and configuration files.
2410+
2411+
"Object" form shall mean any form resulting from mechanical
2412+
transformation or translation of a Source form, including but
2413+
not limited to compiled object code, generated documentation,
2414+
and conversions to other media types.
2415+
2416+
"Work" shall mean the work of authorship, whether in Source or
2417+
Object form, made available under the License, as indicated by a
2418+
copyright notice that is included in or attached to the work
2419+
(an example is provided in the Appendix below).
2420+
2421+
"Derivative Works" shall mean any work, whether in Source or Object
2422+
form, that is based on (or derived from) the Work and for which the
2423+
editorial revisions, annotations, elaborations, or other modifications
2424+
represent, as a whole, an original work of authorship. For the purposes
2425+
of this License, Derivative Works shall not include works that remain
2426+
separable from, or merely link (or bind by name) to the interfaces of,
2427+
the Work and Derivative Works thereof.
2428+
2429+
"Contribution" shall mean any work of authorship, including
2430+
the original version of the Work and any modifications or additions
2431+
to that Work or Derivative Works thereof, that is intentionally
2432+
submitted to Licensor for inclusion in the Work by the copyright owner
2433+
or by an individual or Legal Entity authorized to submit on behalf of
2434+
the copyright owner. For the purposes of this definition, "submitted"
2435+
means any form of electronic, verbal, or written communication sent
2436+
to the Licensor or its representatives, including but not limited to
2437+
communication on electronic mailing lists, source code control systems,
2438+
and issue tracking systems that are managed by, or on behalf of, the
2439+
Licensor for the purpose of discussing and improving the Work, but
2440+
excluding communication that is conspicuously marked or otherwise
2441+
designated in writing by the copyright owner as "Not a Contribution."
2442+
2443+
"Contributor" shall mean Licensor and any individual or Legal Entity
2444+
on behalf of whom a Contribution has been received by Licensor and
2445+
subsequently incorporated within the Work.
2446+
2447+
2. Grant of Copyright License. Subject to the terms and conditions of
2448+
this License, each Contributor hereby grants to You a perpetual,
2449+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
2450+
copyright license to reproduce, prepare Derivative Works of,
2451+
publicly display, publicly perform, sublicense, and distribute the
2452+
Work and such Derivative Works in Source or Object form.
2453+
2454+
3. Grant of Patent License. Subject to the terms and conditions of
2455+
this License, each Contributor hereby grants to You a perpetual,
2456+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
2457+
(except as stated in this section) patent license to make, have made,
2458+
use, offer to sell, sell, import, and otherwise transfer the Work,
2459+
where such license applies only to those patent claims licensable
2460+
by such Contributor that are necessarily infringed by their
2461+
Contribution(s) alone or by combination of their Contribution(s)
2462+
with the Work to which such Contribution(s) was submitted. If You
2463+
institute patent litigation against any entity (including a
2464+
cross-claim or counterclaim in a lawsuit) alleging that the Work
2465+
or a Contribution incorporated within the Work constitutes direct
2466+
or contributory patent infringement, then any patent licenses
2467+
granted to You under this License for that Work shall terminate
2468+
as of the date such litigation is filed.
2469+
2470+
4. Redistribution. You may reproduce and distribute copies of the
2471+
Work or Derivative Works thereof in any medium, with or without
2472+
modifications, and in Source or Object form, provided that You
2473+
meet the following conditions:
2474+
2475+
(a) You must give any other recipients of the Work or
2476+
Derivative Works a copy of this License; and
2477+
2478+
(b) You must cause any modified files to carry prominent notices
2479+
stating that You changed the files; and
2480+
2481+
(c) You must retain, in the Source form of any Derivative Works
2482+
that You distribute, all copyright, patent, trademark, and
2483+
attribution notices from the Source form of the Work,
2484+
excluding those notices that do not pertain to any part of
2485+
the Derivative Works; and
2486+
2487+
(d) If the Work includes a "NOTICE" text file as part of its
2488+
distribution, then any Derivative Works that You distribute must
2489+
include a readable copy of the attribution notices contained
2490+
within such NOTICE file, excluding those notices that do not
2491+
pertain to any part of the Derivative Works, in at least one
2492+
of the following places: within a NOTICE text file distributed
2493+
as part of the Derivative Works; within the Source form or
2494+
documentation, if provided along with the Derivative Works; or,
2495+
within a display generated by the Derivative Works, if and
2496+
wherever such third-party notices normally appear. The contents
2497+
of the NOTICE file are for informational purposes only and
2498+
do not modify the License. You may add Your own attribution
2499+
notices within Derivative Works that You distribute, alongside
2500+
or as an addendum to the NOTICE text from the Work, provided
2501+
that such additional attribution notices cannot be construed
2502+
as modifying the License.
2503+
2504+
You may add Your own copyright statement to Your modifications and
2505+
may provide additional or different license terms and conditions
2506+
for use, reproduction, or distribution of Your modifications, or
2507+
for any such Derivative Works as a whole, provided Your use,
2508+
reproduction, and distribution of the Work otherwise complies with
2509+
the conditions stated in this License.
2510+
2511+
5. Submission of Contributions. Unless You explicitly state otherwise,
2512+
any Contribution intentionally submitted for inclusion in the Work
2513+
by You to the Licensor shall be under the terms and conditions of
2514+
this License, without any additional terms or conditions.
2515+
Notwithstanding the above, nothing herein shall supersede or modify
2516+
the terms of any separate license agreement you may have executed
2517+
with Licensor regarding such Contributions.
2518+
2519+
6. Trademarks. This License does not grant permission to use the trade
2520+
names, trademarks, service marks, or product names of the Licensor,
2521+
except as required for reasonable and customary use in describing the
2522+
origin of the Work and reproducing the content of the NOTICE file.
2523+
2524+
7. Disclaimer of Warranty. Unless required by applicable law or
2525+
agreed to in writing, Licensor provides the Work (and each
2526+
Contributor provides its Contributions) on an "AS IS" BASIS,
2527+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
2528+
implied, including, without limitation, any warranties or conditions
2529+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
2530+
PARTICULAR PURPOSE. You are solely responsible for determining the
2531+
appropriateness of using or redistributing the Work and assume any
2532+
risks associated with Your exercise of permissions under this License.
2533+
2534+
8. Limitation of Liability. In no event and under no legal theory,
2535+
whether in tort (including negligence), contract, or otherwise,
2536+
unless required by applicable law (such as deliberate and grossly
2537+
negligent acts) or agreed to in writing, shall any Contributor be
2538+
liable to You for damages, including any direct, indirect, special,
2539+
incidental, or consequential damages of any character arising as a
2540+
result of this License or out of the use or inability to use the
2541+
Work (including but not limited to damages for loss of goodwill,
2542+
work stoppage, computer failure or malfunction, or any and all
2543+
other commercial damages or losses), even if such Contributor
2544+
has been advised of the possibility of such damages.
2545+
2546+
9. Accepting Warranty or Additional Liability. While redistributing
2547+
the Work or Derivative Works thereof, You may choose to offer,
2548+
and charge a fee for, acceptance of support, warranty, indemnity,
2549+
or other liability obligations and/or rights consistent with this
2550+
License. However, in accepting such obligations, You may act only
2551+
on Your own behalf and on Your sole responsibility, not on behalf
2552+
of any other Contributor, and only if You agree to indemnify,
2553+
defend, and hold each Contributor harmless for any liability
2554+
incurred by, or claims asserted against, such Contributor by reason
2555+
of your accepting any such warranty or additional liability.
2556+
2557+
END OF TERMS AND CONDITIONS
2558+
2559+
APPENDIX: How to apply the Apache License to your work.
2560+
2561+
To apply the Apache License to your work, attach the following
2562+
boilerplate notice, with the fields enclosed by brackets "[]"
2563+
replaced with your own identifying information. (Don't include
2564+
the brackets!) The text should be enclosed in the appropriate
2565+
comment syntax for the file format. We also recommend that a
2566+
file or class name and description of purpose be included on the
2567+
same "printed page" as the copyright notice for easier
2568+
identification within third-party archives.
2569+
2570+
Copyright [yyyy] [name of copyright owner]
2571+
2572+
Licensed under the Apache License, Version 2.0 (the "License");
2573+
you may not use this file except in compliance with the License.
2574+
You may obtain a copy of the License at
2575+
2576+
http://www.apache.org/licenses/LICENSE-2.0
2577+
2578+
Unless required by applicable law or agreed to in writing, software
2579+
distributed under the License is distributed on an "AS IS" BASIS,
2580+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
2581+
See the License for the specific language governing permissions and
2582+
limitations under the License.
2583+
2584+
23752585
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
23762586

23772587
spdlog
23782588

2379-
Version v1.15.2
2589+
Version 1.15.2
23802590
(https://github.com/gabime/spdlog)
23812591

23822592
The MIT License (MIT)
@@ -2959,7 +3169,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29593169

29603170
xtensor
29613171

2962-
Version 0.26.0-scanbot
3172+
Version 0.26.0
29633173
(https://github.com/doo/xtensor)
29643174

29653175
Copyright (c) 2016, Johan Mabille, Sylvain Corlay and Wolf Vollprecht

classic-components-example/adjustable-filters/build.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@ dependencies {
3737
implementation("androidx.appcompat:appcompat:${project.ext.androidxAppcompatVersion}")
3838
implementation("androidx.constraintlayout:constraintlayout:${project.ext.constraintLayoutVersion}")
3939
implementation("io.scanbot:sdk-package-1:${project.ext.scanbotSdkVersion}")
40-
implementation("io.scanbot:sdk-package-ui:${project.ext.scanbotSdkVersion}")
41-
implementation("io.scanbot:sdk-ml-imageprocessor-assets:${project.ext.scanbotSdkVersion}")
42-
implementation("com.squareup.picasso:picasso:${project.ext.picassoVersion}")
4340
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:${project.ext.coroutinesCoreVersion}")
4441
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:${project.ext.coroutinesAndroidVersion}")
4542
implementation("com.google.android.material:material:${project.ext.materialVersion}")

classic-components-example/adjustable-filters/src/main/java/io/scanbot/example/ExampleApplication.kt

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package io.scanbot.example
22

33
import android.app.Application
44
import io.scanbot.example.common.Const
5-
import io.scanbot.sap.SdkFeature
65
import io.scanbot.sdk.ScanbotSDK
76
import io.scanbot.sdk.ScanbotSDKInitializer
7+
import io.scanbot.sdk.licensing.Feature
88
import io.scanbot.sdk.util.log.LoggerProvider
99
import kotlinx.coroutines.CoroutineScope
1010
import kotlinx.coroutines.Dispatchers
@@ -37,11 +37,9 @@ class ExampleApplication : Application(), CoroutineScope {
3737
.withLogging(true)
3838
// TODO 2/2: Enable the Scanbot SDK license key
3939
//.license(this, licenseKey)
40-
.licenceErrorHandler { status, feature, statusMessage ->
40+
.licenseErrorHandler { status, feature, statusMessage ->
4141
logger.d(Const.LOG_TAG, "+++> License status: ${status.name}. Status message: $statusMessage")
42-
if (feature != SdkFeature.NoSdkFeature) {
43-
logger.d(Const.LOG_TAG, "+++> Feature not available: ${feature.name}")
44-
}
42+
logger.d(Const.LOG_TAG, "+++> Feature not available: ${feature.name}")
4543
}
4644
//.sdkFilesDirectory(this, getExternalFilesDir(null)!!)
4745
.initialize(this)
@@ -51,11 +49,11 @@ class ExampleApplication : Application(), CoroutineScope {
5149
val licenseInfo = ScanbotSDK(this).licenseInfo
5250
logger.d(Const.LOG_TAG, "License status: ${licenseInfo.status}")
5351
logger.d(Const.LOG_TAG, "License isValid: ${licenseInfo.isValid}")
54-
logger.d(Const.LOG_TAG, "License expirationDate: ${licenseInfo.expirationDate}")
52+
logger.d(Const.LOG_TAG, "License expirationDate: ${licenseInfo.expirationDateString}")
5553

5654
launch {
5755
// Clear all previously created documents in storage
58-
ScanbotSDK(this@ExampleApplication).getSdkComponent()!!.provideDocumentStorage().deleteAll()
56+
ScanbotSDK(this@ExampleApplication).documentApi.deleteAllDocuments()
5957
}
6058
}
6159
}

0 commit comments

Comments
 (0)