From 10752af16d43855bae217295c77893c346c01c04 Mon Sep 17 00:00:00 2001 From: Philipp Woessner <64482866+pwoessner@users.noreply.github.com> Date: Mon, 13 Jul 2020 14:03:05 +0200 Subject: [PATCH] Technical documentation update with new lib Lottie (#865) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 1.1.0 version bump * Lottie added Co-authored-by: Jakob Möller <jakob.moeller@sap.com> Co-authored-by: AlexanderAlferov <64849422+AlexanderAlferov@users.noreply.github.com> Co-authored-by: Alexander Alferov <a.alferov@sap.com> --- Corona-Warn-App/build.gradle | 4 ++-- Corona-Warn-App/src/main/assets/technical_de.html | 6 +++++- Corona-Warn-App/src/main/assets/technical_en.html | 6 +++++- Corona-Warn-App/src/main/assets/technical_tr.html | 6 +++++- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/Corona-Warn-App/build.gradle b/Corona-Warn-App/build.gradle index f26eb5cbb..7e0652f58 100644 --- a/Corona-Warn-App/build.gradle +++ b/Corona-Warn-App/build.gradle @@ -33,8 +33,8 @@ android { applicationId 'de.rki.coronawarnapp' minSdkVersion 23 targetSdkVersion 29 - versionCode 33 - versionName "1.0.6" + versionCode 34 + versionName "1.1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" resConfigs "de", "en", "tr" diff --git a/Corona-Warn-App/src/main/assets/technical_de.html b/Corona-Warn-App/src/main/assets/technical_de.html index b7a68c45b..d11a44125 100644 --- a/Corona-Warn-App/src/main/assets/technical_de.html +++ b/Corona-Warn-App/src/main/assets/technical_de.html @@ -78,6 +78,10 @@ Licensor: Conscrypt Website: https://github.com/google/conscrypt License: Apache 2.0</p> +<p>Component: Lottie + Licensor: Airbnb, Inc. + Website: http://airbnb.io/lottie + License: Apache 2.0</p> <p>Copyright (c) 2008-2020 Zetetic LLC All rights reserved.</p> <p>Redistribution and use in source and binary forms, with or without @@ -101,7 +105,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p> <p>Apache License 2.0 (guava, joda-time, MockK, RootBeer, Zxing, ZXing Android Embedded, Detekt, - gson, okhttp, kotlinx.coroutines, Retrofit)</p> + gson, okhttp, kotlinx.coroutines, Retrofit, Lottie)</p> <pre><code> Apache License Version 2.0, January 2004 https://www.apache.org/licenses/ diff --git a/Corona-Warn-App/src/main/assets/technical_en.html b/Corona-Warn-App/src/main/assets/technical_en.html index b7a68c45b..d11a44125 100644 --- a/Corona-Warn-App/src/main/assets/technical_en.html +++ b/Corona-Warn-App/src/main/assets/technical_en.html @@ -78,6 +78,10 @@ Licensor: Conscrypt Website: https://github.com/google/conscrypt License: Apache 2.0</p> +<p>Component: Lottie + Licensor: Airbnb, Inc. + Website: http://airbnb.io/lottie + License: Apache 2.0</p> <p>Copyright (c) 2008-2020 Zetetic LLC All rights reserved.</p> <p>Redistribution and use in source and binary forms, with or without @@ -101,7 +105,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p> <p>Apache License 2.0 (guava, joda-time, MockK, RootBeer, Zxing, ZXing Android Embedded, Detekt, - gson, okhttp, kotlinx.coroutines, Retrofit)</p> + gson, okhttp, kotlinx.coroutines, Retrofit, Lottie)</p> <pre><code> Apache License Version 2.0, January 2004 https://www.apache.org/licenses/ diff --git a/Corona-Warn-App/src/main/assets/technical_tr.html b/Corona-Warn-App/src/main/assets/technical_tr.html index b7a68c45b..d11a44125 100644 --- a/Corona-Warn-App/src/main/assets/technical_tr.html +++ b/Corona-Warn-App/src/main/assets/technical_tr.html @@ -78,6 +78,10 @@ Licensor: Conscrypt Website: https://github.com/google/conscrypt License: Apache 2.0</p> +<p>Component: Lottie + Licensor: Airbnb, Inc. + Website: http://airbnb.io/lottie + License: Apache 2.0</p> <p>Copyright (c) 2008-2020 Zetetic LLC All rights reserved.</p> <p>Redistribution and use in source and binary forms, with or without @@ -101,7 +105,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p> <p>Apache License 2.0 (guava, joda-time, MockK, RootBeer, Zxing, ZXing Android Embedded, Detekt, - gson, okhttp, kotlinx.coroutines, Retrofit)</p> + gson, okhttp, kotlinx.coroutines, Retrofit, Lottie)</p> <pre><code> Apache License Version 2.0, January 2004 https://www.apache.org/licenses/ -- GitLab