diff --git a/app/build.gradle b/app/build.gradle index 534cc9d7..bd4cef91 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -28,9 +28,9 @@ android { dependencies { - implementation project(':library') - implementation project(':library-image-loader') - implementation project(':library-syntax') + implementation project(':markwon') + implementation project(':markwon-image-loader') + implementation project(':markwon-syntax') deps.with { implementation it['okhttp'] diff --git a/html-parser-api/build.gradle b/markwon-html-parser-api/build.gradle similarity index 100% rename from html-parser-api/build.gradle rename to markwon-html-parser-api/build.gradle diff --git a/html-parser-api/gradle.properties b/markwon-html-parser-api/gradle.properties similarity index 100% rename from html-parser-api/gradle.properties rename to markwon-html-parser-api/gradle.properties diff --git a/html-parser-api/src/main/AndroidManifest.xml b/markwon-html-parser-api/src/main/AndroidManifest.xml similarity index 100% rename from html-parser-api/src/main/AndroidManifest.xml rename to markwon-html-parser-api/src/main/AndroidManifest.xml diff --git a/html-parser-api/src/main/java/ru/noties/markwon/html/api/HtmlTag.java b/markwon-html-parser-api/src/main/java/ru/noties/markwon/html/api/HtmlTag.java similarity index 100% rename from html-parser-api/src/main/java/ru/noties/markwon/html/api/HtmlTag.java rename to markwon-html-parser-api/src/main/java/ru/noties/markwon/html/api/HtmlTag.java diff --git a/html-parser-api/src/main/java/ru/noties/markwon/html/api/MarkwonHtmlParser.java b/markwon-html-parser-api/src/main/java/ru/noties/markwon/html/api/MarkwonHtmlParser.java similarity index 100% rename from html-parser-api/src/main/java/ru/noties/markwon/html/api/MarkwonHtmlParser.java rename to markwon-html-parser-api/src/main/java/ru/noties/markwon/html/api/MarkwonHtmlParser.java diff --git a/html-parser-api/src/main/java/ru/noties/markwon/html/api/MarkwonHtmlParserNoOp.java b/markwon-html-parser-api/src/main/java/ru/noties/markwon/html/api/MarkwonHtmlParserNoOp.java similarity index 100% rename from html-parser-api/src/main/java/ru/noties/markwon/html/api/MarkwonHtmlParserNoOp.java rename to markwon-html-parser-api/src/main/java/ru/noties/markwon/html/api/MarkwonHtmlParserNoOp.java diff --git a/html-parser-impl/build.gradle b/markwon-html-parser-impl/build.gradle similarity index 93% rename from html-parser-impl/build.gradle rename to markwon-html-parser-impl/build.gradle index 675aa5e9..cc91b5fc 100644 --- a/html-parser-impl/build.gradle +++ b/markwon-html-parser-impl/build.gradle @@ -15,7 +15,7 @@ android { dependencies { - api project(':html-parser-api') + api project(':markwon-html-parser-api') deps.with { api it['support-annotations'] diff --git a/html-parser-impl/gradle.properties b/markwon-html-parser-impl/gradle.properties similarity index 100% rename from html-parser-impl/gradle.properties rename to markwon-html-parser-impl/gradle.properties diff --git a/html-parser-impl/src/main/AndroidManifest.xml b/markwon-html-parser-impl/src/main/AndroidManifest.xml similarity index 100% rename from html-parser-impl/src/main/AndroidManifest.xml rename to markwon-html-parser-impl/src/main/AndroidManifest.xml diff --git a/html-parser-impl/src/main/java/ru/noties/markwon/html/impl/HtmlEmptyTagReplacement.java b/markwon-html-parser-impl/src/main/java/ru/noties/markwon/html/impl/HtmlEmptyTagReplacement.java similarity index 100% rename from html-parser-impl/src/main/java/ru/noties/markwon/html/impl/HtmlEmptyTagReplacement.java rename to markwon-html-parser-impl/src/main/java/ru/noties/markwon/html/impl/HtmlEmptyTagReplacement.java diff --git a/html-parser-impl/src/main/java/ru/noties/markwon/html/impl/HtmlTagImpl.java b/markwon-html-parser-impl/src/main/java/ru/noties/markwon/html/impl/HtmlTagImpl.java similarity index 100% rename from html-parser-impl/src/main/java/ru/noties/markwon/html/impl/HtmlTagImpl.java rename to markwon-html-parser-impl/src/main/java/ru/noties/markwon/html/impl/HtmlTagImpl.java diff --git a/html-parser-impl/src/main/java/ru/noties/markwon/html/impl/MarkwonHtmlParserImpl.java b/markwon-html-parser-impl/src/main/java/ru/noties/markwon/html/impl/MarkwonHtmlParserImpl.java similarity index 100% rename from html-parser-impl/src/main/java/ru/noties/markwon/html/impl/MarkwonHtmlParserImpl.java rename to markwon-html-parser-impl/src/main/java/ru/noties/markwon/html/impl/MarkwonHtmlParserImpl.java diff --git a/html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/UncheckedIOException.java b/markwon-html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/UncheckedIOException.java similarity index 100% rename from html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/UncheckedIOException.java rename to markwon-html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/UncheckedIOException.java diff --git a/html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/helper/Normalizer.java b/markwon-html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/helper/Normalizer.java similarity index 100% rename from html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/helper/Normalizer.java rename to markwon-html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/helper/Normalizer.java diff --git a/html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/helper/Validate.java b/markwon-html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/helper/Validate.java similarity index 100% rename from html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/helper/Validate.java rename to markwon-html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/helper/Validate.java diff --git a/html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/nodes/Attribute.java b/markwon-html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/nodes/Attribute.java similarity index 100% rename from html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/nodes/Attribute.java rename to markwon-html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/nodes/Attribute.java diff --git a/html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/nodes/Attributes.java b/markwon-html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/nodes/Attributes.java similarity index 100% rename from html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/nodes/Attributes.java rename to markwon-html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/nodes/Attributes.java diff --git a/html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/nodes/DocumentType.java b/markwon-html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/nodes/DocumentType.java similarity index 100% rename from html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/nodes/DocumentType.java rename to markwon-html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/nodes/DocumentType.java diff --git a/html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/nodes/Entities.java b/markwon-html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/nodes/Entities.java similarity index 100% rename from html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/nodes/Entities.java rename to markwon-html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/nodes/Entities.java diff --git a/html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/nodes/EntitiesData.java b/markwon-html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/nodes/EntitiesData.java similarity index 100% rename from html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/nodes/EntitiesData.java rename to markwon-html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/nodes/EntitiesData.java diff --git a/html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/parser/CharacterReader.java b/markwon-html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/parser/CharacterReader.java similarity index 100% rename from html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/parser/CharacterReader.java rename to markwon-html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/parser/CharacterReader.java diff --git a/html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/parser/ParseError.java b/markwon-html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/parser/ParseError.java similarity index 100% rename from html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/parser/ParseError.java rename to markwon-html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/parser/ParseError.java diff --git a/html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/parser/ParseErrorList.java b/markwon-html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/parser/ParseErrorList.java similarity index 100% rename from html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/parser/ParseErrorList.java rename to markwon-html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/parser/ParseErrorList.java diff --git a/html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/parser/Token.java b/markwon-html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/parser/Token.java similarity index 100% rename from html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/parser/Token.java rename to markwon-html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/parser/Token.java diff --git a/html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/parser/Tokeniser.java b/markwon-html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/parser/Tokeniser.java similarity index 100% rename from html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/parser/Tokeniser.java rename to markwon-html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/parser/Tokeniser.java diff --git a/html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/parser/TokeniserState.java b/markwon-html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/parser/TokeniserState.java similarity index 100% rename from html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/parser/TokeniserState.java rename to markwon-html-parser-impl/src/main/java/ru/noties/markwon/html/impl/jsoup/parser/TokeniserState.java diff --git a/html-parser-impl/src/test/java/ru/noties/markwon/html/impl/MarkwonHtmlParserImplTest.java b/markwon-html-parser-impl/src/test/java/ru/noties/markwon/html/impl/MarkwonHtmlParserImplTest.java similarity index 100% rename from html-parser-impl/src/test/java/ru/noties/markwon/html/impl/MarkwonHtmlParserImplTest.java rename to markwon-html-parser-impl/src/test/java/ru/noties/markwon/html/impl/MarkwonHtmlParserImplTest.java diff --git a/library-image-loader/build.gradle b/markwon-image-loader/build.gradle similarity index 95% rename from library-image-loader/build.gradle rename to markwon-image-loader/build.gradle index dfc0be7c..4a8103ca 100644 --- a/library-image-loader/build.gradle +++ b/markwon-image-loader/build.gradle @@ -20,7 +20,7 @@ android { dependencies { - api project(':library') + api project(':markwon') deps.with { api it['android-svg'] diff --git a/library-image-loader/gradle.properties b/markwon-image-loader/gradle.properties similarity index 100% rename from library-image-loader/gradle.properties rename to markwon-image-loader/gradle.properties diff --git a/library-image-loader/src/main/AndroidManifest.xml b/markwon-image-loader/src/main/AndroidManifest.xml similarity index 100% rename from library-image-loader/src/main/AndroidManifest.xml rename to markwon-image-loader/src/main/AndroidManifest.xml diff --git a/library-image-loader/src/main/java/ru/noties/markwon/il/AsyncDrawableLoader.java b/markwon-image-loader/src/main/java/ru/noties/markwon/il/AsyncDrawableLoader.java similarity index 100% rename from library-image-loader/src/main/java/ru/noties/markwon/il/AsyncDrawableLoader.java rename to markwon-image-loader/src/main/java/ru/noties/markwon/il/AsyncDrawableLoader.java diff --git a/library-image-loader/src/main/java/ru/noties/markwon/il/DrawableUtils.java b/markwon-image-loader/src/main/java/ru/noties/markwon/il/DrawableUtils.java similarity index 100% rename from library-image-loader/src/main/java/ru/noties/markwon/il/DrawableUtils.java rename to markwon-image-loader/src/main/java/ru/noties/markwon/il/DrawableUtils.java diff --git a/library-image-loader/src/main/java/ru/noties/markwon/il/GifMediaDecoder.java b/markwon-image-loader/src/main/java/ru/noties/markwon/il/GifMediaDecoder.java similarity index 100% rename from library-image-loader/src/main/java/ru/noties/markwon/il/GifMediaDecoder.java rename to markwon-image-loader/src/main/java/ru/noties/markwon/il/GifMediaDecoder.java diff --git a/library-image-loader/src/main/java/ru/noties/markwon/il/ImageMediaDecoder.java b/markwon-image-loader/src/main/java/ru/noties/markwon/il/ImageMediaDecoder.java similarity index 100% rename from library-image-loader/src/main/java/ru/noties/markwon/il/ImageMediaDecoder.java rename to markwon-image-loader/src/main/java/ru/noties/markwon/il/ImageMediaDecoder.java diff --git a/library-image-loader/src/main/java/ru/noties/markwon/il/MediaDecoder.java b/markwon-image-loader/src/main/java/ru/noties/markwon/il/MediaDecoder.java similarity index 100% rename from library-image-loader/src/main/java/ru/noties/markwon/il/MediaDecoder.java rename to markwon-image-loader/src/main/java/ru/noties/markwon/il/MediaDecoder.java diff --git a/library-image-loader/src/main/java/ru/noties/markwon/il/SvgMediaDecoder.java b/markwon-image-loader/src/main/java/ru/noties/markwon/il/SvgMediaDecoder.java similarity index 100% rename from library-image-loader/src/main/java/ru/noties/markwon/il/SvgMediaDecoder.java rename to markwon-image-loader/src/main/java/ru/noties/markwon/il/SvgMediaDecoder.java diff --git a/library-syntax/README.md b/markwon-syntax/README.md similarity index 100% rename from library-syntax/README.md rename to markwon-syntax/README.md diff --git a/library-syntax/art/markwon-syntax-darkula.png b/markwon-syntax/art/markwon-syntax-darkula.png similarity index 100% rename from library-syntax/art/markwon-syntax-darkula.png rename to markwon-syntax/art/markwon-syntax-darkula.png diff --git a/library-syntax/art/markwon-syntax-default.png b/markwon-syntax/art/markwon-syntax-default.png similarity index 100% rename from library-syntax/art/markwon-syntax-default.png rename to markwon-syntax/art/markwon-syntax-default.png diff --git a/library-syntax/build.gradle b/markwon-syntax/build.gradle similarity index 95% rename from library-syntax/build.gradle rename to markwon-syntax/build.gradle index 750b39b5..be3f0680 100644 --- a/library-syntax/build.gradle +++ b/markwon-syntax/build.gradle @@ -15,7 +15,7 @@ android { dependencies { - api project(':library') + api project(':markwon') deps.with { api it['support-annotations'] diff --git a/library-syntax/gradle.properties b/markwon-syntax/gradle.properties similarity index 100% rename from library-syntax/gradle.properties rename to markwon-syntax/gradle.properties diff --git a/library-syntax/src/main/AndroidManifest.xml b/markwon-syntax/src/main/AndroidManifest.xml similarity index 100% rename from library-syntax/src/main/AndroidManifest.xml rename to markwon-syntax/src/main/AndroidManifest.xml diff --git a/library-syntax/src/main/java/ru/noties/markwon/syntax/Prism4jSyntaxHighlight.java b/markwon-syntax/src/main/java/ru/noties/markwon/syntax/Prism4jSyntaxHighlight.java similarity index 100% rename from library-syntax/src/main/java/ru/noties/markwon/syntax/Prism4jSyntaxHighlight.java rename to markwon-syntax/src/main/java/ru/noties/markwon/syntax/Prism4jSyntaxHighlight.java diff --git a/library-syntax/src/main/java/ru/noties/markwon/syntax/Prism4jSyntaxVisitor.java b/markwon-syntax/src/main/java/ru/noties/markwon/syntax/Prism4jSyntaxVisitor.java similarity index 100% rename from library-syntax/src/main/java/ru/noties/markwon/syntax/Prism4jSyntaxVisitor.java rename to markwon-syntax/src/main/java/ru/noties/markwon/syntax/Prism4jSyntaxVisitor.java diff --git a/library-syntax/src/main/java/ru/noties/markwon/syntax/Prism4jTheme.java b/markwon-syntax/src/main/java/ru/noties/markwon/syntax/Prism4jTheme.java similarity index 100% rename from library-syntax/src/main/java/ru/noties/markwon/syntax/Prism4jTheme.java rename to markwon-syntax/src/main/java/ru/noties/markwon/syntax/Prism4jTheme.java diff --git a/library-syntax/src/main/java/ru/noties/markwon/syntax/Prism4jThemeBase.java b/markwon-syntax/src/main/java/ru/noties/markwon/syntax/Prism4jThemeBase.java similarity index 100% rename from library-syntax/src/main/java/ru/noties/markwon/syntax/Prism4jThemeBase.java rename to markwon-syntax/src/main/java/ru/noties/markwon/syntax/Prism4jThemeBase.java diff --git a/library-syntax/src/main/java/ru/noties/markwon/syntax/Prism4jThemeDarkula.java b/markwon-syntax/src/main/java/ru/noties/markwon/syntax/Prism4jThemeDarkula.java similarity index 100% rename from library-syntax/src/main/java/ru/noties/markwon/syntax/Prism4jThemeDarkula.java rename to markwon-syntax/src/main/java/ru/noties/markwon/syntax/Prism4jThemeDarkula.java diff --git a/library-syntax/src/main/java/ru/noties/markwon/syntax/Prism4jThemeDefault.java b/markwon-syntax/src/main/java/ru/noties/markwon/syntax/Prism4jThemeDefault.java similarity index 100% rename from library-syntax/src/main/java/ru/noties/markwon/syntax/Prism4jThemeDefault.java rename to markwon-syntax/src/main/java/ru/noties/markwon/syntax/Prism4jThemeDefault.java diff --git a/library-view/README.md b/markwon-view/README.md similarity index 100% rename from library-view/README.md rename to markwon-view/README.md diff --git a/library-view/build.gradle b/markwon-view/build.gradle similarity index 94% rename from library-view/build.gradle rename to markwon-view/build.gradle index 53a88c2a..d79c2b01 100644 --- a/library-view/build.gradle +++ b/markwon-view/build.gradle @@ -15,7 +15,7 @@ android { dependencies { - api project(':library') + api project(':markwon') deps.with { compileOnly it['support-app-compat'] diff --git a/library-view/gradle.properties b/markwon-view/gradle.properties similarity index 100% rename from library-view/gradle.properties rename to markwon-view/gradle.properties diff --git a/library-view/src/debug/java/ru/noties/markwon/view/debug/DebugConfigurationProvider.java b/markwon-view/src/debug/java/ru/noties/markwon/view/debug/DebugConfigurationProvider.java similarity index 100% rename from library-view/src/debug/java/ru/noties/markwon/view/debug/DebugConfigurationProvider.java rename to markwon-view/src/debug/java/ru/noties/markwon/view/debug/DebugConfigurationProvider.java diff --git a/library-view/src/debug/res/layout/debug_markwon_preview.xml b/markwon-view/src/debug/res/layout/debug_markwon_preview.xml similarity index 100% rename from library-view/src/debug/res/layout/debug_markwon_preview.xml rename to markwon-view/src/debug/res/layout/debug_markwon_preview.xml diff --git a/library-view/src/debug/res/layout/debug_markwon_preview_compat.xml b/markwon-view/src/debug/res/layout/debug_markwon_preview_compat.xml similarity index 100% rename from library-view/src/debug/res/layout/debug_markwon_preview_compat.xml rename to markwon-view/src/debug/res/layout/debug_markwon_preview_compat.xml diff --git a/library-view/src/debug/res/values/debug_strings.xml b/markwon-view/src/debug/res/values/debug_strings.xml similarity index 100% rename from library-view/src/debug/res/values/debug_strings.xml rename to markwon-view/src/debug/res/values/debug_strings.xml diff --git a/library-view/src/main/AndroidManifest.xml b/markwon-view/src/main/AndroidManifest.xml similarity index 100% rename from library-view/src/main/AndroidManifest.xml rename to markwon-view/src/main/AndroidManifest.xml diff --git a/library-view/src/main/java/ru/noties/markwon/view/IMarkwonView.java b/markwon-view/src/main/java/ru/noties/markwon/view/IMarkwonView.java similarity index 100% rename from library-view/src/main/java/ru/noties/markwon/view/IMarkwonView.java rename to markwon-view/src/main/java/ru/noties/markwon/view/IMarkwonView.java diff --git a/library-view/src/main/java/ru/noties/markwon/view/MarkwonView.java b/markwon-view/src/main/java/ru/noties/markwon/view/MarkwonView.java similarity index 100% rename from library-view/src/main/java/ru/noties/markwon/view/MarkwonView.java rename to markwon-view/src/main/java/ru/noties/markwon/view/MarkwonView.java diff --git a/library-view/src/main/java/ru/noties/markwon/view/MarkwonViewCompat.java b/markwon-view/src/main/java/ru/noties/markwon/view/MarkwonViewCompat.java similarity index 100% rename from library-view/src/main/java/ru/noties/markwon/view/MarkwonViewCompat.java rename to markwon-view/src/main/java/ru/noties/markwon/view/MarkwonViewCompat.java diff --git a/library-view/src/main/java/ru/noties/markwon/view/MarkwonViewHelper.java b/markwon-view/src/main/java/ru/noties/markwon/view/MarkwonViewHelper.java similarity index 100% rename from library-view/src/main/java/ru/noties/markwon/view/MarkwonViewHelper.java rename to markwon-view/src/main/java/ru/noties/markwon/view/MarkwonViewHelper.java diff --git a/library-view/src/main/res/values/attrs.xml b/markwon-view/src/main/res/values/attrs.xml similarity index 100% rename from library-view/src/main/res/values/attrs.xml rename to markwon-view/src/main/res/values/attrs.xml diff --git a/library/build.gradle b/markwon/build.gradle similarity index 100% rename from library/build.gradle rename to markwon/build.gradle diff --git a/library/gradle.properties b/markwon/gradle.properties similarity index 100% rename from library/gradle.properties rename to markwon/gradle.properties diff --git a/library/src/main/AndroidManifest.xml b/markwon/src/main/AndroidManifest.xml similarity index 100% rename from library/src/main/AndroidManifest.xml rename to markwon/src/main/AndroidManifest.xml diff --git a/library/src/main/java/ru/noties/markwon/AsyncDrawableLoaderNoOp.java b/markwon/src/main/java/ru/noties/markwon/AsyncDrawableLoaderNoOp.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/AsyncDrawableLoaderNoOp.java rename to markwon/src/main/java/ru/noties/markwon/AsyncDrawableLoaderNoOp.java diff --git a/library/src/main/java/ru/noties/markwon/DrawablesScheduler.java b/markwon/src/main/java/ru/noties/markwon/DrawablesScheduler.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/DrawablesScheduler.java rename to markwon/src/main/java/ru/noties/markwon/DrawablesScheduler.java diff --git a/library/src/main/java/ru/noties/markwon/LinkResolverDef.java b/markwon/src/main/java/ru/noties/markwon/LinkResolverDef.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/LinkResolverDef.java rename to markwon/src/main/java/ru/noties/markwon/LinkResolverDef.java diff --git a/library/src/main/java/ru/noties/markwon/Markwon.java b/markwon/src/main/java/ru/noties/markwon/Markwon.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/Markwon.java rename to markwon/src/main/java/ru/noties/markwon/Markwon.java diff --git a/library/src/main/java/ru/noties/markwon/SpannableBuilder.java b/markwon/src/main/java/ru/noties/markwon/SpannableBuilder.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/SpannableBuilder.java rename to markwon/src/main/java/ru/noties/markwon/SpannableBuilder.java diff --git a/library/src/main/java/ru/noties/markwon/SpannableConfiguration.java b/markwon/src/main/java/ru/noties/markwon/SpannableConfiguration.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/SpannableConfiguration.java rename to markwon/src/main/java/ru/noties/markwon/SpannableConfiguration.java diff --git a/library/src/main/java/ru/noties/markwon/SpannableFactory.java b/markwon/src/main/java/ru/noties/markwon/SpannableFactory.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/SpannableFactory.java rename to markwon/src/main/java/ru/noties/markwon/SpannableFactory.java diff --git a/library/src/main/java/ru/noties/markwon/SpannableFactoryDef.java b/markwon/src/main/java/ru/noties/markwon/SpannableFactoryDef.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/SpannableFactoryDef.java rename to markwon/src/main/java/ru/noties/markwon/SpannableFactoryDef.java diff --git a/library/src/main/java/ru/noties/markwon/SpannableStringBuilderImpl.java b/markwon/src/main/java/ru/noties/markwon/SpannableStringBuilderImpl.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/SpannableStringBuilderImpl.java rename to markwon/src/main/java/ru/noties/markwon/SpannableStringBuilderImpl.java diff --git a/library/src/main/java/ru/noties/markwon/SpannedReversed.java b/markwon/src/main/java/ru/noties/markwon/SpannedReversed.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/SpannedReversed.java rename to markwon/src/main/java/ru/noties/markwon/SpannedReversed.java diff --git a/library/src/main/java/ru/noties/markwon/SyntaxHighlight.java b/markwon/src/main/java/ru/noties/markwon/SyntaxHighlight.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/SyntaxHighlight.java rename to markwon/src/main/java/ru/noties/markwon/SyntaxHighlight.java diff --git a/library/src/main/java/ru/noties/markwon/SyntaxHighlightNoOp.java b/markwon/src/main/java/ru/noties/markwon/SyntaxHighlightNoOp.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/SyntaxHighlightNoOp.java rename to markwon/src/main/java/ru/noties/markwon/SyntaxHighlightNoOp.java diff --git a/library/src/main/java/ru/noties/markwon/TableRowsScheduler.java b/markwon/src/main/java/ru/noties/markwon/TableRowsScheduler.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/TableRowsScheduler.java rename to markwon/src/main/java/ru/noties/markwon/TableRowsScheduler.java diff --git a/library/src/main/java/ru/noties/markwon/UrlProcessor.java b/markwon/src/main/java/ru/noties/markwon/UrlProcessor.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/UrlProcessor.java rename to markwon/src/main/java/ru/noties/markwon/UrlProcessor.java diff --git a/library/src/main/java/ru/noties/markwon/UrlProcessorAndroidAssets.java b/markwon/src/main/java/ru/noties/markwon/UrlProcessorAndroidAssets.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/UrlProcessorAndroidAssets.java rename to markwon/src/main/java/ru/noties/markwon/UrlProcessorAndroidAssets.java diff --git a/library/src/main/java/ru/noties/markwon/UrlProcessorNoOp.java b/markwon/src/main/java/ru/noties/markwon/UrlProcessorNoOp.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/UrlProcessorNoOp.java rename to markwon/src/main/java/ru/noties/markwon/UrlProcessorNoOp.java diff --git a/library/src/main/java/ru/noties/markwon/UrlProcessorRelativeToAbsolute.java b/markwon/src/main/java/ru/noties/markwon/UrlProcessorRelativeToAbsolute.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/UrlProcessorRelativeToAbsolute.java rename to markwon/src/main/java/ru/noties/markwon/UrlProcessorRelativeToAbsolute.java diff --git a/library/src/main/java/ru/noties/markwon/renderer/ImageSize.java b/markwon/src/main/java/ru/noties/markwon/renderer/ImageSize.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/renderer/ImageSize.java rename to markwon/src/main/java/ru/noties/markwon/renderer/ImageSize.java diff --git a/library/src/main/java/ru/noties/markwon/renderer/ImageSizeResolver.java b/markwon/src/main/java/ru/noties/markwon/renderer/ImageSizeResolver.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/renderer/ImageSizeResolver.java rename to markwon/src/main/java/ru/noties/markwon/renderer/ImageSizeResolver.java diff --git a/library/src/main/java/ru/noties/markwon/renderer/ImageSizeResolverDef.java b/markwon/src/main/java/ru/noties/markwon/renderer/ImageSizeResolverDef.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/renderer/ImageSizeResolverDef.java rename to markwon/src/main/java/ru/noties/markwon/renderer/ImageSizeResolverDef.java diff --git a/library/src/main/java/ru/noties/markwon/renderer/SpannableMarkdownVisitor.java b/markwon/src/main/java/ru/noties/markwon/renderer/SpannableMarkdownVisitor.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/renderer/SpannableMarkdownVisitor.java rename to markwon/src/main/java/ru/noties/markwon/renderer/SpannableMarkdownVisitor.java diff --git a/library/src/main/java/ru/noties/markwon/renderer/SpannableRenderer.java b/markwon/src/main/java/ru/noties/markwon/renderer/SpannableRenderer.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/renderer/SpannableRenderer.java rename to markwon/src/main/java/ru/noties/markwon/renderer/SpannableRenderer.java diff --git a/library/src/main/java/ru/noties/markwon/renderer/html/BoldProvider.java b/markwon/src/main/java/ru/noties/markwon/renderer/html/BoldProvider.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/renderer/html/BoldProvider.java rename to markwon/src/main/java/ru/noties/markwon/renderer/html/BoldProvider.java diff --git a/library/src/main/java/ru/noties/markwon/renderer/html/ImageProviderImpl.java b/markwon/src/main/java/ru/noties/markwon/renderer/html/ImageProviderImpl.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/renderer/html/ImageProviderImpl.java rename to markwon/src/main/java/ru/noties/markwon/renderer/html/ImageProviderImpl.java diff --git a/library/src/main/java/ru/noties/markwon/renderer/html/ItalicsProvider.java b/markwon/src/main/java/ru/noties/markwon/renderer/html/ItalicsProvider.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/renderer/html/ItalicsProvider.java rename to markwon/src/main/java/ru/noties/markwon/renderer/html/ItalicsProvider.java diff --git a/library/src/main/java/ru/noties/markwon/renderer/html/LinkProvider.java b/markwon/src/main/java/ru/noties/markwon/renderer/html/LinkProvider.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/renderer/html/LinkProvider.java rename to markwon/src/main/java/ru/noties/markwon/renderer/html/LinkProvider.java diff --git a/library/src/main/java/ru/noties/markwon/renderer/html/SpannableHtmlParser.java b/markwon/src/main/java/ru/noties/markwon/renderer/html/SpannableHtmlParser.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/renderer/html/SpannableHtmlParser.java rename to markwon/src/main/java/ru/noties/markwon/renderer/html/SpannableHtmlParser.java diff --git a/library/src/main/java/ru/noties/markwon/renderer/html/StrikeProvider.java b/markwon/src/main/java/ru/noties/markwon/renderer/html/StrikeProvider.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/renderer/html/StrikeProvider.java rename to markwon/src/main/java/ru/noties/markwon/renderer/html/StrikeProvider.java diff --git a/library/src/main/java/ru/noties/markwon/renderer/html/SubScriptProvider.java b/markwon/src/main/java/ru/noties/markwon/renderer/html/SubScriptProvider.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/renderer/html/SubScriptProvider.java rename to markwon/src/main/java/ru/noties/markwon/renderer/html/SubScriptProvider.java diff --git a/library/src/main/java/ru/noties/markwon/renderer/html/SuperScriptProvider.java b/markwon/src/main/java/ru/noties/markwon/renderer/html/SuperScriptProvider.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/renderer/html/SuperScriptProvider.java rename to markwon/src/main/java/ru/noties/markwon/renderer/html/SuperScriptProvider.java diff --git a/library/src/main/java/ru/noties/markwon/renderer/html/TagParser.java b/markwon/src/main/java/ru/noties/markwon/renderer/html/TagParser.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/renderer/html/TagParser.java rename to markwon/src/main/java/ru/noties/markwon/renderer/html/TagParser.java diff --git a/library/src/main/java/ru/noties/markwon/renderer/html/UnderlineProvider.java b/markwon/src/main/java/ru/noties/markwon/renderer/html/UnderlineProvider.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/renderer/html/UnderlineProvider.java rename to markwon/src/main/java/ru/noties/markwon/renderer/html/UnderlineProvider.java diff --git a/library/src/main/java/ru/noties/markwon/spans/AsyncDrawable.java b/markwon/src/main/java/ru/noties/markwon/spans/AsyncDrawable.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/spans/AsyncDrawable.java rename to markwon/src/main/java/ru/noties/markwon/spans/AsyncDrawable.java diff --git a/library/src/main/java/ru/noties/markwon/spans/AsyncDrawableSpan.java b/markwon/src/main/java/ru/noties/markwon/spans/AsyncDrawableSpan.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/spans/AsyncDrawableSpan.java rename to markwon/src/main/java/ru/noties/markwon/spans/AsyncDrawableSpan.java diff --git a/library/src/main/java/ru/noties/markwon/spans/BlockQuoteSpan.java b/markwon/src/main/java/ru/noties/markwon/spans/BlockQuoteSpan.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/spans/BlockQuoteSpan.java rename to markwon/src/main/java/ru/noties/markwon/spans/BlockQuoteSpan.java diff --git a/library/src/main/java/ru/noties/markwon/spans/BulletListItemSpan.java b/markwon/src/main/java/ru/noties/markwon/spans/BulletListItemSpan.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/spans/BulletListItemSpan.java rename to markwon/src/main/java/ru/noties/markwon/spans/BulletListItemSpan.java diff --git a/library/src/main/java/ru/noties/markwon/spans/CanvasUtils.java b/markwon/src/main/java/ru/noties/markwon/spans/CanvasUtils.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/spans/CanvasUtils.java rename to markwon/src/main/java/ru/noties/markwon/spans/CanvasUtils.java diff --git a/library/src/main/java/ru/noties/markwon/spans/CodeSpan.java b/markwon/src/main/java/ru/noties/markwon/spans/CodeSpan.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/spans/CodeSpan.java rename to markwon/src/main/java/ru/noties/markwon/spans/CodeSpan.java diff --git a/library/src/main/java/ru/noties/markwon/spans/ColorUtils.java b/markwon/src/main/java/ru/noties/markwon/spans/ColorUtils.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/spans/ColorUtils.java rename to markwon/src/main/java/ru/noties/markwon/spans/ColorUtils.java diff --git a/library/src/main/java/ru/noties/markwon/spans/EmphasisSpan.java b/markwon/src/main/java/ru/noties/markwon/spans/EmphasisSpan.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/spans/EmphasisSpan.java rename to markwon/src/main/java/ru/noties/markwon/spans/EmphasisSpan.java diff --git a/library/src/main/java/ru/noties/markwon/spans/HeadingSpan.java b/markwon/src/main/java/ru/noties/markwon/spans/HeadingSpan.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/spans/HeadingSpan.java rename to markwon/src/main/java/ru/noties/markwon/spans/HeadingSpan.java diff --git a/library/src/main/java/ru/noties/markwon/spans/LeadingMarginUtils.java b/markwon/src/main/java/ru/noties/markwon/spans/LeadingMarginUtils.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/spans/LeadingMarginUtils.java rename to markwon/src/main/java/ru/noties/markwon/spans/LeadingMarginUtils.java diff --git a/library/src/main/java/ru/noties/markwon/spans/LinkSpan.java b/markwon/src/main/java/ru/noties/markwon/spans/LinkSpan.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/spans/LinkSpan.java rename to markwon/src/main/java/ru/noties/markwon/spans/LinkSpan.java diff --git a/library/src/main/java/ru/noties/markwon/spans/ObjectsPool.java b/markwon/src/main/java/ru/noties/markwon/spans/ObjectsPool.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/spans/ObjectsPool.java rename to markwon/src/main/java/ru/noties/markwon/spans/ObjectsPool.java diff --git a/library/src/main/java/ru/noties/markwon/spans/OrderedListItemSpan.java b/markwon/src/main/java/ru/noties/markwon/spans/OrderedListItemSpan.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/spans/OrderedListItemSpan.java rename to markwon/src/main/java/ru/noties/markwon/spans/OrderedListItemSpan.java diff --git a/library/src/main/java/ru/noties/markwon/spans/SpannableTheme.java b/markwon/src/main/java/ru/noties/markwon/spans/SpannableTheme.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/spans/SpannableTheme.java rename to markwon/src/main/java/ru/noties/markwon/spans/SpannableTheme.java diff --git a/library/src/main/java/ru/noties/markwon/spans/StrongEmphasisSpan.java b/markwon/src/main/java/ru/noties/markwon/spans/StrongEmphasisSpan.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/spans/StrongEmphasisSpan.java rename to markwon/src/main/java/ru/noties/markwon/spans/StrongEmphasisSpan.java diff --git a/library/src/main/java/ru/noties/markwon/spans/SubScriptSpan.java b/markwon/src/main/java/ru/noties/markwon/spans/SubScriptSpan.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/spans/SubScriptSpan.java rename to markwon/src/main/java/ru/noties/markwon/spans/SubScriptSpan.java diff --git a/library/src/main/java/ru/noties/markwon/spans/SuperScriptSpan.java b/markwon/src/main/java/ru/noties/markwon/spans/SuperScriptSpan.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/spans/SuperScriptSpan.java rename to markwon/src/main/java/ru/noties/markwon/spans/SuperScriptSpan.java diff --git a/library/src/main/java/ru/noties/markwon/spans/TableRowSpan.java b/markwon/src/main/java/ru/noties/markwon/spans/TableRowSpan.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/spans/TableRowSpan.java rename to markwon/src/main/java/ru/noties/markwon/spans/TableRowSpan.java diff --git a/library/src/main/java/ru/noties/markwon/spans/TaskListDrawable.java b/markwon/src/main/java/ru/noties/markwon/spans/TaskListDrawable.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/spans/TaskListDrawable.java rename to markwon/src/main/java/ru/noties/markwon/spans/TaskListDrawable.java diff --git a/library/src/main/java/ru/noties/markwon/spans/TaskListSpan.java b/markwon/src/main/java/ru/noties/markwon/spans/TaskListSpan.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/spans/TaskListSpan.java rename to markwon/src/main/java/ru/noties/markwon/spans/TaskListSpan.java diff --git a/library/src/main/java/ru/noties/markwon/spans/ThematicBreakSpan.java b/markwon/src/main/java/ru/noties/markwon/spans/ThematicBreakSpan.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/spans/ThematicBreakSpan.java rename to markwon/src/main/java/ru/noties/markwon/spans/ThematicBreakSpan.java diff --git a/library/src/main/java/ru/noties/markwon/tasklist/TaskListBlock.java b/markwon/src/main/java/ru/noties/markwon/tasklist/TaskListBlock.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/tasklist/TaskListBlock.java rename to markwon/src/main/java/ru/noties/markwon/tasklist/TaskListBlock.java diff --git a/library/src/main/java/ru/noties/markwon/tasklist/TaskListBlockParser.java b/markwon/src/main/java/ru/noties/markwon/tasklist/TaskListBlockParser.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/tasklist/TaskListBlockParser.java rename to markwon/src/main/java/ru/noties/markwon/tasklist/TaskListBlockParser.java diff --git a/library/src/main/java/ru/noties/markwon/tasklist/TaskListExtension.java b/markwon/src/main/java/ru/noties/markwon/tasklist/TaskListExtension.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/tasklist/TaskListExtension.java rename to markwon/src/main/java/ru/noties/markwon/tasklist/TaskListExtension.java diff --git a/library/src/main/java/ru/noties/markwon/tasklist/TaskListItem.java b/markwon/src/main/java/ru/noties/markwon/tasklist/TaskListItem.java similarity index 100% rename from library/src/main/java/ru/noties/markwon/tasklist/TaskListItem.java rename to markwon/src/main/java/ru/noties/markwon/tasklist/TaskListItem.java diff --git a/library/src/main/res/values/ids.xml b/markwon/src/main/res/values/ids.xml similarity index 100% rename from library/src/main/res/values/ids.xml rename to markwon/src/main/res/values/ids.xml diff --git a/sample-custom-extension/build.gradle b/sample-custom-extension/build.gradle index 96b0a3cd..5672dfe9 100644 --- a/sample-custom-extension/build.gradle +++ b/sample-custom-extension/build.gradle @@ -18,5 +18,5 @@ android { } dependencies { - implementation project(':library') + implementation project(':markwon') } diff --git a/settings.gradle b/settings.gradle index 11a2f10c..da34ce9e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,3 @@ -include ':app', ':library', ':library-image-loader', ':library-view', ':sample-custom-extension', - ':library-syntax', ':html-parser-api', ':html-parser-impl' +rootProject.name = 'MarkwonProject' +include ':app', ':markwon', ':markwon-image-loader', ':markwon-view', ':sample-custom-extension', + ':markwon-syntax', ':markwon-html-parser-api', ':markwon-html-parser-impl'