From afd5469d72115ab8d0ce452fc98874f73ca18ee9 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Fri, 6 Nov 2020 12:23:41 -0600 Subject: [PATCH] Add Markwon dependency --- app/build.gradle.kts | 2 ++ app/licenses.yml | 20 +++++++++++ app/src/main/assets/licenses.json | 52 ++++++++++++++++++++++++++++ buildSrc/src/main/kotlin/Versions.kt | 1 + deps_fdroid.txt | 7 ++++ deps_googleplay.txt | 7 ++++ 6 files changed, 89 insertions(+) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 3ef42194c..a80a02ea6 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -159,6 +159,8 @@ dependencies { kapt("androidx.room:room-compiler:${Versions.room}") implementation("io.reactivex.rxjava2:rxandroid:2.1.1") implementation("androidx.paging:paging-runtime:2.1.2") + implementation("io.noties.markwon:core:${Versions.markwon}") + implementation("io.noties.markwon:ext-strikethrough:${Versions.markwon}") kapt("com.jakewharton:butterknife-compiler:${Versions.butterknife}") implementation("com.jakewharton:butterknife:${Versions.butterknife}") diff --git a/app/licenses.yml b/app/licenses.yml index 75f2a7509..dd06aab9a 100644 --- a/app/licenses.yml +++ b/app/licenses.yml @@ -803,3 +803,23 @@ license: The Apache Software License, Version 2.0 licenseUrl: https://www.apache.org/licenses/LICENSE-2.0.txt url: https://github.com/google/dagger +- artifact: io.noties.markwon:ext-strikethrough:+ + name: ext-strikethrough + copyrightHolder: Dimitry Ivanov + license: The Apache Software License, Version 2.0 + licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt + url: https://github.com/noties/Markwon +- artifact: io.noties.markwon:core:+ + name: core + copyrightHolder: Dimitry Ivanov + license: The Apache Software License, Version 2.0 + licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt + url: https://github.com/noties/Markwon +- artifact: com.atlassian.commonmark:commonmark-ext-gfm-strikethrough:+ + name: commonmark-ext-gfm-strikethrough + copyrightHolder: Atlassian and others + license: BSD 2-Clause +- artifact: com.atlassian.commonmark:commonmark:+ + name: commonmark + copyrightHolder: Atlassian and others + license: BSD 2-Clause diff --git a/app/src/main/assets/licenses.json b/app/src/main/assets/licenses.json index c518e998c..eae8dfe63 100644 --- a/app/src/main/assets/licenses.json +++ b/app/src/main/assets/licenses.json @@ -1910,6 +1910,58 @@ "normalizedLicense": "apache2", "url": "https://github.com/google/dagger", "libraryName": "hilt-core" + }, + { + "artifactId": { + "name": "ext-strikethrough", + "group": "io.noties.markwon", + "version": "+" + }, + "copyrightHolder": "Dimitry Ivanov", + "copyrightStatement": "Copyright © Dimitry Ivanov. All rights reserved.", + "license": "The Apache Software License, Version 2.0", + "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt", + "normalizedLicense": "apache2", + "url": "https://github.com/noties/Markwon", + "libraryName": "ext-strikethrough" + }, + { + "artifactId": { + "name": "core", + "group": "io.noties.markwon", + "version": "+" + }, + "copyrightHolder": "Dimitry Ivanov", + "copyrightStatement": "Copyright © Dimitry Ivanov. All rights reserved.", + "license": "The Apache Software License, Version 2.0", + "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt", + "normalizedLicense": "apache2", + "url": "https://github.com/noties/Markwon", + "libraryName": "core" + }, + { + "artifactId": { + "name": "commonmark-ext-gfm-strikethrough", + "group": "com.atlassian.commonmark", + "version": "+" + }, + "copyrightHolder": "Atlassian and others", + "copyrightStatement": "Copyright © Atlassian and others. All rights reserved.", + "license": "BSD 2-Clause", + "normalizedLicense": "bsd_2_clauses", + "libraryName": "commonmark-ext-gfm-strikethrough" + }, + { + "artifactId": { + "name": "commonmark", + "group": "com.atlassian.commonmark", + "version": "+" + }, + "copyrightHolder": "Atlassian and others", + "copyrightStatement": "Copyright © Atlassian and others. All rights reserved.", + "license": "BSD 2-Clause", + "normalizedLicense": "bsd_2_clauses", + "libraryName": "commonmark" } ] } \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 3dfb107d8..770f91051 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -17,4 +17,5 @@ object Versions { const val hilt = "2.29.1-alpha" const val hilt_androidx = "1.0.0-alpha02" const val lifecycle = "2.2.0" + const val markwon = "4.6.0" } \ No newline at end of file diff --git a/deps_fdroid.txt b/deps_fdroid.txt index 263fe5923..f4f49e94a 100644 --- a/deps_fdroid.txt +++ b/deps_fdroid.txt @@ -280,6 +280,13 @@ +| +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.2.0 (*) +| +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.2.0 (*) +| \--- androidx.recyclerview:recyclerview:1.0.0 -> 1.1.0 (*) +++--- io.noties.markwon:core:4.6.0 ++| +--- androidx.annotation:annotation:1.1.0 ++| \--- com.atlassian.commonmark:commonmark:0.13.0 +++--- io.noties.markwon:ext-strikethrough:4.6.0 ++| +--- io.noties.markwon:core:4.6.0 (*) ++| \--- com.atlassian.commonmark:commonmark-ext-gfm-strikethrough:0.13.0 ++| \--- com.atlassian.commonmark:commonmark:0.13.0 ++--- com.jakewharton:butterknife:10.2.3 +| \--- com.jakewharton:butterknife-runtime:10.2.3 +| +--- com.jakewharton:butterknife-annotations:10.2.3 diff --git a/deps_googleplay.txt b/deps_googleplay.txt index aa10630b9..530a48f71 100644 --- a/deps_googleplay.txt +++ b/deps_googleplay.txt @@ -398,6 +398,13 @@ +| +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.2.0 (*) +| +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.2.0 (*) +| \--- androidx.recyclerview:recyclerview:1.0.0 -> 1.1.0 (*) +++--- io.noties.markwon:core:4.6.0 ++| +--- androidx.annotation:annotation:1.1.0 ++| \--- com.atlassian.commonmark:commonmark:0.13.0 +++--- io.noties.markwon:ext-strikethrough:4.6.0 ++| +--- io.noties.markwon:core:4.6.0 (*) ++| \--- com.atlassian.commonmark:commonmark-ext-gfm-strikethrough:0.13.0 ++| \--- com.atlassian.commonmark:commonmark:0.13.0 ++--- com.jakewharton:butterknife:10.2.3 +| \--- com.jakewharton:butterknife-runtime:10.2.3 +| +--- com.jakewharton:butterknife-annotations:10.2.3