From f1be44619eb7caac632b1a02bc007dcc5fea6cd8 Mon Sep 17 00:00:00 2001 From: Maxwell Date: Mon, 27 Feb 2023 21:10:51 +0200 Subject: [PATCH] Refactor project and update modules - Refactor workflows - Bump gradle to 7.4.1 - Update issue template - Update PULL_REQUEST_TEMPLATE.md - Delete dependabot.yml - Update .github --- .github/ISSUE_TEMPLATE/bug-report.md | 96 ++++---- .github/ISSUE_TEMPLATE/config.yaml | 8 + .github/ISSUE_TEMPLATE/feature-request.md | 62 +++-- .github/ISSUE_TEMPLATE/question.md | 41 +++- .github/PULL_REQUEST_TEMPLATE.md | 30 +-- .github/dependabot.yml | 14 -- .github/pr-labeler.yml | 3 + .github/release-drafter-config.yml | 50 ++++ .github/workflows/android-spotless.yml | 25 ++ .github/workflows/android-test.yml | 29 +++ .github/workflows/android.yaml | 15 -- .../first-contribution-greeting.yaml | 16 ++ .github/workflows/gradle-dokka.yml | 27 ++ .../workflows/gradle-wrapper-validation.yaml | 10 + .github/workflows/greetings.yaml | 13 - .github/workflows/label.yaml | 13 - .github/workflows/pull-request-labeler.yaml | 20 ++ .github/workflows/release-drafter.yml | 28 +++ .github/workflows/version-updater.yml | 46 ++++ app/build.gradle.kts | 79 +++--- app/src/main/AndroidManifest.xml | 2 +- .../support/markdown/core/AbstractActivity.kt | 6 +- .../support/markdown/core/AbstractFragment.kt | 44 +--- .../core/extensions/ContextExtensinos.kt | 6 - .../markdown/core/plugin/CoilImagePlugin.kt | 42 ++++ .../plugin/loader/CoilAsyncDrawableLoader.kt | 67 +++++ .../markdown/core/plugin/store/CoilStore.kt | 13 + .../plugin/{ => store}/CoilStorePlugin.kt | 21 +- .../core/plugin/target/AsyncDrawableTarget.kt | 48 ++++ .../support/markdown/data/FeedDataSource.kt | 51 +--- .../support/markdown/data/koin/Modules.kt | 5 +- .../repository/GetFeedTextPagedRepository.kt | 2 +- .../anitrend/support/markdown/sample/App.kt | 24 -- .../support/markdown/sample/koin/Modules.kt | 26 +- build.gradle.kts | 32 +-- buildSrc/build.gradle.kts | 45 ++-- buildSrc/settings.gradle.kts | 9 + .../support/markdown/buildSrc/Libraries.kt | 230 ------------------ .../markdown/buildSrc/common/Configuration.kt | 7 + .../markdown/buildSrc/common/Versions.kt | 41 ---- .../plugin/components/AndroidConfiguration.kt | 66 +++-- .../plugin/components/AndroidDependencies.kt | 5 +- .../plugin/components/AndroidOptions.kt | 6 +- .../plugin/components/AndroidPlugins.kt | 2 +- .../extensions/DependencyHandlerExtensions.kt | 225 +++++++++++++++++ .../plugin/extensions/ProjectExtensions.kt | 31 ++- .../plugin/strategy/DependencyStrategy.kt | 54 ++-- gradle.properties | 6 +- gradle/libs.versions.toml | 125 ++++++++++ gradle/release.properties | 2 + gradle/wrapper/gradle-wrapper.jar | Bin 59203 -> 59536 bytes gradle/wrapper/gradle-wrapper.properties | 3 +- markdown/build.gradle.kts | 48 +--- 53 files changed, 1162 insertions(+), 757 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE/config.yaml delete mode 100644 .github/dependabot.yml create mode 100644 .github/pr-labeler.yml create mode 100644 .github/release-drafter-config.yml create mode 100644 .github/workflows/android-spotless.yml create mode 100644 .github/workflows/android-test.yml delete mode 100644 .github/workflows/android.yaml create mode 100644 .github/workflows/first-contribution-greeting.yaml create mode 100644 .github/workflows/gradle-dokka.yml create mode 100644 .github/workflows/gradle-wrapper-validation.yaml delete mode 100644 .github/workflows/greetings.yaml delete mode 100644 .github/workflows/label.yaml create mode 100644 .github/workflows/pull-request-labeler.yaml create mode 100644 .github/workflows/release-drafter.yml create mode 100644 .github/workflows/version-updater.yml create mode 100644 app/src/main/kotlin/co/anitrend/support/markdown/core/plugin/CoilImagePlugin.kt create mode 100644 app/src/main/kotlin/co/anitrend/support/markdown/core/plugin/loader/CoilAsyncDrawableLoader.kt create mode 100644 app/src/main/kotlin/co/anitrend/support/markdown/core/plugin/store/CoilStore.kt rename app/src/main/kotlin/co/anitrend/support/markdown/core/plugin/{ => store}/CoilStorePlugin.kt (70%) create mode 100644 app/src/main/kotlin/co/anitrend/support/markdown/core/plugin/target/AsyncDrawableTarget.kt create mode 100644 buildSrc/settings.gradle.kts delete mode 100644 buildSrc/src/main/java/co/anitrend/support/markdown/buildSrc/Libraries.kt create mode 100644 buildSrc/src/main/java/co/anitrend/support/markdown/buildSrc/common/Configuration.kt delete mode 100644 buildSrc/src/main/java/co/anitrend/support/markdown/buildSrc/common/Versions.kt create mode 100644 buildSrc/src/main/java/co/anitrend/support/markdown/buildSrc/plugin/extensions/DependencyHandlerExtensions.kt create mode 100644 gradle/libs.versions.toml create mode 100644 gradle/release.properties diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md index 68fc7d5..f348bcc 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.md +++ b/.github/ISSUE_TEMPLATE/bug-report.md @@ -1,51 +1,55 @@ --- +title: "[Bug]: " name: Bug Report about: Report any issues regarding the project and help us identify bugs quicker - +labels: [":bug: bug"] --- -# Issue Guidelines - -Before opening a new issue, please take a moment to review our [**community guidelines**](https://github.com/AniTrend/support-markdown/blob/master/CONTRIBUTING.md) to make the contribution process easy and effective for everyone involved. - -**You may find an answer in already closed issues**: -https://github.com/AniTrend/support-markdown/issues?q=is%3Aissue+is%3Aclosed - - -## Description Of Bug - - -__Pages__ with long titles are under the __Tab__ are cropped from start instead of from the end. - -**Steps To Reproduce** -1. Go to '...' -2. Click on '....' -3. Scroll down to '....' -4. See error - - -## Expected Behaviour - - -Perhaps it would be best if anime/manga titles are not truncated - - -## Screenshots/Videos - - - -## Device & Build Information - - -* OS Version: Lollipop 5.0.1 -* App Version: 1.2.0 -* Phone Model: Xperia SP -* Phone Brand: Sony - - -## Additional Context - - -I have tested with multiple devices and the issue doesn't seem to be bound to any specific device, OS version or form factor. - -I have tested with ...... +- type: markdown + attributes: + value: | + # Issue Guidelines + + Before opening a new issue, please take a moment to review our [**community guidelines**](https://github.com/AniTrend/support-markdown/blob/develop/CONTRIBUTING.md) to make the contribution process easy and effective for everyone involved. + + **You may find an answer in already closed issues**: + https://github.com/AniTrend/support-markdown/issues?q=is%3Aissue+is%3Aclosed + +- type: textarea + id: description + attributes: + label: Description of bug + description: A clear and concise description of what the bug is. In other words what is the behaviour + validations: + required: true + +- type: textarea + id: expectation + attributes: + label: Expected behavior + description: A clear and concise description of what you expect to happen. This is the intented behaviour + validations: + required: false + +- type: textarea + id: context + attributes: + label: Additional context + description: What are you trying to accomplish? Providing context helps us come up with a solution that is most useful in the real world. + validations: + required: false + +- type: textarea + id: logs + attributes: + label: Relevant log output + description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks. + render: shell +- type: checkboxes + id: guidelines + attributes: + label: Community guidelines + description: Please take a moment to review our [community guidelines](https://github.com/AniTrend/support-markdown/blob/develop/CONTRIBUTING.md) + options: + - label: I have read the community guidelines + required: true diff --git a/.github/ISSUE_TEMPLATE/config.yaml b/.github/ISSUE_TEMPLATE/config.yaml new file mode 100644 index 0000000..eb3aa6a --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yaml @@ -0,0 +1,8 @@ +blank_issues_enabled: false +contact_links: + - name: AniTrend Community Support + url: https://github.com/orgs/AniTrend/discussions + about: Please ask and answer questions here. + - name: Frequestnly Ased Questions + url: https://docs.anitrend.co/project/ + about: Please review the FAQ for commonly asked questions. \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md index a8a3ab0..5110a0d 100644 --- a/.github/ISSUE_TEMPLATE/feature-request.md +++ b/.github/ISSUE_TEMPLATE/feature-request.md @@ -1,31 +1,41 @@ --- +title: "[Feature]: " name: Feature Request about: Got a suggestion? Then this is what you should use - +labels: [":star2: enhancement"] --- -# Issue Guidelines - -Before opening a new issue, please take a moment to review our [**community guidelines**](https://github.com/AniTrend/support-markdown/blob/master/CONTRIBUTING.md) to make the contribution process easy and effective for everyone involved. - -**You may find an answer in already closed issues**: -https://github.com/AniTrend/support-markdown/issues?q=is%3Aissue+is%3Aclosed - - -## Feature Information - - -A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] - - -## Solution Information - - -A clear and concise description of what you want to happen. - -**Describe alternatives you've considered** -A clear and concise description of any alternative solutions or features you've considered. - - -## Additional context -Add any other context or screenshots about the feature request here. +- type: markdown + attributes: + value: | + # Issue Guidelines + + Before opening a new issue, please take a moment to review our [**community guidelines**](https://github.com/AniTrend/support-markdown/blob/develop/CONTRIBUTING.md) to make the contribution process easy and effective for everyone involved. + + **You may find an answer in already closed issues**: + https://github.com/AniTrend/support-markdown/issues?q=is%3Aissue+is%3Aclosed + +- type: textarea + id: information + attributes: + label: Description of bug + description: Is your feature request related to a problem? Please describe. + validations: + required: true + +- type: textarea + id: context + attributes: + label: Additional context + description: What are you trying to accomplish? Providing context helps us come up with a solution that is most useful in the real world, also include images or links if you have any in this section + validations: + required: false + +- type: checkboxes + id: guidelines + attributes: + label: Community guidelines + description: Please take a moment to review our [community guidelines](https://github.com/AniTrend/support-markdown/blob/develop/CONTRIBUTING.md) + options: + - label: I have read the community guidelines + required: true diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md index d11501b..b9f7055 100644 --- a/.github/ISSUE_TEMPLATE/question.md +++ b/.github/ISSUE_TEMPLATE/question.md @@ -1,21 +1,40 @@ --- +title: "[Question]: " name: Question about: Ask any general question regarding the project, also if you use this if you don't know what category to use - +labels: [":grey_question: question"] --- -# Issue Guidelines +- type: markdown + attributes: + value: | + # Issue Guidelines -Before opening a new issue, please take a moment to review our [**community guidelines**](https://github.com/AniTrend/support-markdown/blob/master/CONTRIBUTING.md) to make the contribution process easy and effective for everyone involved. + Before opening a new issue, please take a moment to review our [**community guidelines**](https://github.com/AniTrend/support-markdown/blob/develop/CONTRIBUTING.md) to make the contribution process easy and effective for everyone involved. -**You may find an answer in already closed issues**: -https://github.com/AniTrend/support-markdown/issues?q=is%3Aissue+is%3Aclosed + **You may find an answer in already closed issues**: + https://github.com/AniTrend/support-markdown/issues?q=is%3Aissue+is%3Aclosed -## Question - -I would like to know if... I have also searched in the closed issues and... +- type: textarea + id: question + attributes: + label: Clearly and explicitly explain the details about your question + validations: + required: true -## Additional Context - +- type: textarea + id: context + attributes: + label: Additional context + description: Any additional information regarding your question, you may also add screenshots + validations: + required: false -I am currently using... +- type: checkboxes + id: guidelines + attributes: + label: Community guidelines + description: Please take a moment to review our [community guidelines](https://github.com/AniTrend/support-markdown/blob/develop/CONTRIBUTING.md) + options: + - label: I have read the community guidelines + required: true diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 1f49acb..98061db 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,6 +1,6 @@ # Pull Request Template -Thank you for contributing! Please take a moment to review our [**contributing guidelines**](https://github.com/AniTrend/support-markdown/blob/master/CONTRIBUTING.md) +Thank you for contributing! Please take a moment to review our [**contributing guidelines**](https://github.com/AniTrend/support-markdown/blob/develop/CONTRIBUTING.md) to make the process easy and effective for everyone involved. **Please open an issue** before embarking on any significant pull request, especially those that @@ -11,33 +11,25 @@ Before opening a pull request, please ensure: -- [ ] You have followed our [**contributing guidelines**](https://github.com/AniTrend/support-markdown/blob/master/CONTRIBUTING.md) -- [ ] double-check your branch is based on `develop` and targets `develop` -- [ ] Pull request has tests -- [ ] Code is well-commented, linted and follows project conventions -- [ ] Documentation is updated (if necessary) -- [ ] Description explains the issue/use-case resolved -- [ ] I did not commit files that are excluded in the .gitignore file (Happens if you stage files with Android Studio) +- You have followed our [**contributing guidelines**](https://github.com/AniTrend/support-markdown/blob/develop/CONTRIBUTING.md) +- Double-check your branch is based on `develop` and targets `develop` (where applicable) +- Pull request has tests (If applicable) +- Code is well-commented, linted and follows project conventions +- Documentation is updated (if necessary) +- Description explains the issue/use-case resolved ## Description -## Motivation and Context - - - -## How Has This Been Tested? - - - - -## Screenshots (if appropriate): ## Types of changes - [ ] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) -- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected) +- [ ] Enhancement (Improve existing functionality) + +**IMPORTANT**: By submitting a patch, you agree to allow the project +owners to license your work under the terms of the [Apache License](https://github.com/AniTrend/support-markdown/blob/develop/LICENSE). diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index c7523c1..0000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,14 +0,0 @@ -version: 2 -updates: -- package-ecosystem: gradle - directory: "/gradle" - schedule: - interval: weekly - time: "03:00" - timezone: Africa/Johannesburg - open-pull-requests-limit: 12 - target-branch: develop - reviewers: - - wax911 - labels: - - enhancement diff --git a/.github/pr-labeler.yml b/.github/pr-labeler.yml new file mode 100644 index 0000000..889afad --- /dev/null +++ b/.github/pr-labeler.yml @@ -0,0 +1,3 @@ +feature: 'feature/*' +refactor: ['refactor/*', 'enhancement/*'] +hotfix: ['hotfix/*', 'bugfix/*'] \ No newline at end of file diff --git a/.github/release-drafter-config.yml b/.github/release-drafter-config.yml new file mode 100644 index 0000000..aacef4d --- /dev/null +++ b/.github/release-drafter-config.yml @@ -0,0 +1,50 @@ +name-template: 'v$RESOLVED_VERSION' +tag-template: '$RESOLVED_VERSION' +categories: + - title: '🚀 Features' + labels: + - 'feature' + - title: '🐛 Bug Fixes' + labels: + - 'bugfix' + - 'hotfix' + - title: '🧰 Maintenance' + labels: + - 'refactor' + - title: '📦 Dependencies' + labels: + - 'dependencies' +autolabeler: + - label: 'docs' + files: + - '*.md' + branch: + - '/docs{0,1}\/.+/' + - label: 'dependencies' + branch: + - '/dependencies\/.+/' + - '/renovate\/.+/' +change-template: '- $TITLE by @$AUTHOR in #$NUMBER' +change-title-escapes: '\<*_&' # You can add # and @ to disable mentions, and add ` to disable code blocks. +version-resolver: + major: + labels: + - 'major' + minor: + labels: + - 'minor' + - 'refactor' + - 'feature' + patch: + labels: + - 'patch' + - 'bugfix' + - 'hotfix' + - 'dependencies' + default: patch +template: | + # What's Changed + + $CHANGES + + **Full Changelog**: https://github.com/$OWNER/$REPOSITORY/compare/$PREVIOUS_TAG...v$RESOLVED_VERSION diff --git a/.github/workflows/android-spotless.yml b/.github/workflows/android-spotless.yml new file mode 100644 index 0000000..f777f73 --- /dev/null +++ b/.github/workflows/android-spotless.yml @@ -0,0 +1,25 @@ +name: Run spotless check + +on: + push: + branches: [ develop ] + pull_request: + branches: + - '*' + +jobs: + android-spotless: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: set up JDK 11 + uses: actions/setup-java@v3 + with: + java-version: '11' + distribution: 'adopt' + + - name: Setup Gradle + uses: gradle/gradle-build-action@v2 + + - name: Run spotless check + run: ./gradlew spotlessCheck diff --git a/.github/workflows/android-test.yml b/.github/workflows/android-test.yml new file mode 100644 index 0000000..3192ee6 --- /dev/null +++ b/.github/workflows/android-test.yml @@ -0,0 +1,29 @@ +name: android-unit-test + +on: + push: + branches: [ develop ] + pull_request: + branches: + - '*' + +jobs: + android-unit-test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: set up JDK 11 + uses: actions/setup-java@v3 + with: + java-version: '11' + distribution: 'adopt' + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Run tests + run: ./gradlew test + - name: Publish Test Report + uses: mikepenz/action-junit-report@v3 + if: always() # always run even if the previous step fails + with: + report_paths: '**/build/test-results/**/TEST-*.xml' diff --git a/.github/workflows/android.yaml b/.github/workflows/android.yaml deleted file mode 100644 index 4be5d9c..0000000 --- a/.github/workflows/android.yaml +++ /dev/null @@ -1,15 +0,0 @@ -name: Android unit test task - -on: [push] - -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v1 - - name: set up JDK 1.8 - uses: actions/setup-java@v1 - with: - java-version: 1.8 - - name: Build with Gradle - run: ./gradlew test --stacktrace diff --git a/.github/workflows/first-contribution-greeting.yaml b/.github/workflows/first-contribution-greeting.yaml new file mode 100644 index 0000000..23e6849 --- /dev/null +++ b/.github/workflows/first-contribution-greeting.yaml @@ -0,0 +1,16 @@ +name: first-contribution-greeting + +on: [pull_request_target, issues] + +jobs: + first-contribution-greeting: + runs-on: ubuntu-latest + permissions: + issues: write + pull-requests: write + steps: + - uses: actions/first-interaction@v1 + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + issue-message: "Hey there! Thank you for creating an issue :) Please take a moment to review our [**community guidelines**](https://github.com/AniTrend/support-markdown/blob/develop/CONTRIBUTING.md) to make the contribution process easy and effective for everyone involved." + pr-message: "Hey there! Thank you for this PR :) Please take a moment to review our [**community guidelines**](https://github.com/AniTrend/support-markdown/blob/develop/CONTRIBUTING.md) to make the contribution process easy and effective for everyone involved." diff --git a/.github/workflows/gradle-dokka.yml b/.github/workflows/gradle-dokka.yml new file mode 100644 index 0000000..668dec0 --- /dev/null +++ b/.github/workflows/gradle-dokka.yml @@ -0,0 +1,27 @@ +name: gradle-dokka + +on: + push: + branches: [ develop ] + +jobs: + gradle-dokka: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: set up JDK 11 + uses: actions/setup-java@v3 + with: + java-version: '11' + distribution: 'adopt' + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Generate docs with dokka + run: ./gradlew dokkaHtmlMultiModule + + - name: Deploy 🚀 + uses: JamesIves/github-pages-deploy-action@v4.4.1 + with: + branch: docs # The branch the action should deploy to. + folder: dokka-docs # The folder the action should deploy. diff --git a/.github/workflows/gradle-wrapper-validation.yaml b/.github/workflows/gradle-wrapper-validation.yaml new file mode 100644 index 0000000..d5116ef --- /dev/null +++ b/.github/workflows/gradle-wrapper-validation.yaml @@ -0,0 +1,10 @@ +name: gradle-wrapper-validation +on: [push, pull_request] + +jobs: + gradle-wrapper-validation: + name: "Validation" + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: gradle/wrapper-validation-action@v1 \ No newline at end of file diff --git a/.github/workflows/greetings.yaml b/.github/workflows/greetings.yaml deleted file mode 100644 index 87d9ff0..0000000 --- a/.github/workflows/greetings.yaml +++ /dev/null @@ -1,13 +0,0 @@ -name: Greet first-time contributors - -on: [pull_request, issues] - -jobs: - greeting: - runs-on: ubuntu-latest - steps: - - uses: actions/first-interaction@v1 - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - issue-message: 'Message that will be displayed on users'' first issue' - pr-message: 'Message that will be displayed on users'' first pr' diff --git a/.github/workflows/label.yaml b/.github/workflows/label.yaml deleted file mode 100644 index 2b01dcd..0000000 --- a/.github/workflows/label.yaml +++ /dev/null @@ -1,13 +0,0 @@ - -name: Label PRs based on files changed -on: [pull_request] - -jobs: - label: - - runs-on: ubuntu-latest - - steps: - - uses: actions/labeler@v2 # See: https://github.com/actions/labeler - with: - repo-token: "${{ secrets.GITHUB_TOKEN }}" diff --git a/.github/workflows/pull-request-labeler.yaml b/.github/workflows/pull-request-labeler.yaml new file mode 100644 index 0000000..78e60ff --- /dev/null +++ b/.github/workflows/pull-request-labeler.yaml @@ -0,0 +1,20 @@ + +name: pull-request-labeler +on: + pull_request: + types: [opened] + +permissions: + contents: read + +jobs: + pr-labeler: + permissions: + contents: read # for TimonVS/pr-labeler-action to read config file + pull-requests: write # for TimonVS/pr-labeler-action to add labels in PR + runs-on: ubuntu-latest + steps: + - uses: TimonVS/pr-labeler-action@v4 + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + configuration-path: .github/pr-labeler.yml # optional, .github/pr-labeler.yml is the default value \ No newline at end of file diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml new file mode 100644 index 0000000..d955fde --- /dev/null +++ b/.github/workflows/release-drafter.yml @@ -0,0 +1,28 @@ +name: release-drafter + +on: + push: + branches: + - develop + pull_request: + # Only following types are handled by the action, but one can default to all as well + types: [opened, reopened, synchronize] + +permissions: + contents: read + +jobs: + update-release-draft: + permissions: + # write permission is required to create a github release + contents: write + # write permission is required for autolabeler + pull-requests: write + runs-on: ubuntu-latest + steps: + - uses: release-drafter/release-drafter@v5 + with: + config-name: release-drafter-config.yml + disable-autolabeler: false + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/version-updater.yml b/.github/workflows/version-updater.yml new file mode 100644 index 0000000..3a0c1a5 --- /dev/null +++ b/.github/workflows/version-updater.yml @@ -0,0 +1,46 @@ +name: version-updater + +on: + push: + tags: + - '*' + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Extract version + id: version + run: echo "${GITHUB_REF#refs/tags/}" > VERSION + + - name: Calculate version code + id: code + run: | + IFS='.' read -ra VER <<< "$(cat VERSION)" + MAJOR=$((VER[0] * 1000000000)) + MINOR=$((VER[1] * 10000)) + PATCH=${VER[2]} + CODE=$((MAJOR + MINOR + PATCH)) + echo "version=$(cat VERSION)" > gradle/version.properties + echo "code=$CODE" >> gradle/version.properties + echo "name=v$(cat VERSION)" >> gradle/version.properties + + - name: Show version + run: cat gradle/release.properties + + - name: Commit release.properties + run: | + git config --local user.email "action@github.com" + git config --local user.name "GitHub Action" + git add gradle/version.properties + git commit -m "Bump version to $(cat VERSION)" + + - name: Push changes + uses: ad-m/github-push-action@master + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + branch: develop + directory: . diff --git a/app/build.gradle.kts b/app/build.gradle.kts index b0a6094..c866a6e 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,70 +1,63 @@ -import co.anitrend.support.markdown.buildSrc.Libraries -import org.gradle.api.artifacts.Configuration - plugins { id("co.anitrend.support.markdown") - id("koin") + id("com.apollographql.apollo3").version("3.7.3") } apollo { - // instruct the compiler to generate Kotlin models - generateKotlinModels.set(true) + packageName.set("co.anitrend.support.markdown.domain.entities") } + configurations { - fun excludeDefault(configuration: Configuration) { - configuration.exclude( + fun Configuration.excludeDefault() { + exclude( mapOf( "group" to "org.jetbrains", "module" to "annotations" ) ) } - println("Configurations available [${configurations.joinToString()}]") - getByName("implementation") { - excludeDefault(this) - } - getByName("androidTestImplementation") { - excludeDefault(this) - } + logger.lifecycle("Configurations available [${configurations.joinToString()}]") + getByName("implementation") { excludeDefault() } + getByName("androidTestImplementation") { excludeDefault() } } dependencies { implementation(project(":markdown")) - implementation(Libraries.Google.Material.material) + implementation("com.apollographql.apollo3:apollo-runtime:3.7.3") + + implementation(libs.google.android.material) - implementation(Libraries.AndroidX.Core.coreKtx) - implementation(Libraries.AndroidX.Fragment.fragmentKtx) - implementation(Libraries.AndroidX.Activity.activityKtx) - implementation(Libraries.AndroidX.ConstraintLayout.constraintLayout) - implementation(Libraries.AndroidX.SwipeRefresh.swipeRefreshLayout) - implementation(Libraries.AndroidX.Preference.preferenceKtx) - implementation(Libraries.AndroidX.Recycler.recyclerView) + implementation(libs.androidx.core.ktx) + implementation(libs.androidx.fragment.ktx) + implementation(libs.androidx.activity.ktx) + implementation(libs.androidx.constraintlayout) - implementation(Libraries.AndroidX.Paging.common) - implementation(Libraries.AndroidX.Paging.runtime) - implementation(Libraries.AndroidX.Paging.runtimeKtx) + implementation(libs.androidx.paging.common) + implementation(libs.androidx.paging.runtime) + implementation(libs.androidx.paging.runtime.ktx) - implementation(Libraries.Apollo.runtime) - implementation(Libraries.Apollo.android) - implementation(Libraries.Apollo.coroutines) + implementation(libs.androidx.swipeRefreshLayout) - implementation(Libraries.Markwon.core) - implementation(Libraries.Markwon.html) - implementation(Libraries.Markwon.image) - implementation(Libraries.Markwon.coil) - implementation(Libraries.Markwon.linkify) - implementation(Libraries.Markwon.simpleExt) - implementation(Libraries.Markwon.Extension.taskList) - implementation(Libraries.Markwon.Extension.strikeThrough) + implementation(libs.androidx.recyclerView) - implementation(Libraries.JetBrains.Markdown.markdown) + implementation(libs.markwon.core) + implementation(libs.markwon.editor) + implementation(libs.markwon.html) + implementation(libs.markwon.coil) + implementation(libs.markwon.parser) + implementation(libs.markwon.linkify) + implementation(libs.markwon.simple.ext) + implementation(libs.markwon.syntax.highlight) + implementation(libs.markwon.ext.tasklist) + implementation(libs.markwon.ext.strikethrough) + implementation(libs.markwon.ext.tables) - implementation(Libraries.Coil.coil) - implementation(Libraries.Coil.video) - implementation(Libraries.Coil.svg) - implementation(Libraries.Coil.gif) + implementation(libs.coil) + implementation(libs.coil.video) + implementation(libs.coil.svg) + implementation(libs.coil.gif) - implementation(Libraries.betterLinkMovement) + implementation(libs.saket.betterlinkmovementmethod) } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b43f0b1..f657220 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,7 +14,7 @@ android:supportsRtl="true" android:theme="@style/AppTheme" tools:ignore="GoogleAppIndexingWarning"> - + diff --git a/app/src/main/kotlin/co/anitrend/support/markdown/core/AbstractActivity.kt b/app/src/main/kotlin/co/anitrend/support/markdown/core/AbstractActivity.kt index 3d8fa84..ce89d1b 100644 --- a/app/src/main/kotlin/co/anitrend/support/markdown/core/AbstractActivity.kt +++ b/app/src/main/kotlin/co/anitrend/support/markdown/core/AbstractActivity.kt @@ -6,13 +6,13 @@ import androidx.viewbinding.ViewBinding import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.MainScope import org.koin.androidx.fragment.android.setupKoinFragmentFactory -import org.koin.androidx.scope.activityScope -import org.koin.core.scope.KoinScopeComponent +import org.koin.androidx.scope.activityRetainedScope +import org.koin.core.component.KoinScopeComponent abstract class AbstractActivity : AppCompatActivity(), CoroutineScope by MainScope(), KoinScopeComponent { - override val scope by lazy { activityScope() } + override val scope by activityRetainedScope() protected var binding: B? = null diff --git a/app/src/main/kotlin/co/anitrend/support/markdown/core/AbstractFragment.kt b/app/src/main/kotlin/co/anitrend/support/markdown/core/AbstractFragment.kt index ff1701e..48a0e9b 100644 --- a/app/src/main/kotlin/co/anitrend/support/markdown/core/AbstractFragment.kt +++ b/app/src/main/kotlin/co/anitrend/support/markdown/core/AbstractFragment.kt @@ -11,12 +11,12 @@ import kotlinx.coroutines.Job import kotlinx.coroutines.MainScope import kotlinx.coroutines.launch import org.koin.androidx.scope.fragmentScope -import org.koin.core.scope.KoinScopeComponent +import org.koin.core.component.KoinScopeComponent abstract class AbstractFragment(@LayoutRes layoutId: Int) : Fragment(layoutId), CoroutineScope by MainScope(), KoinScopeComponent { - override val scope by lazy { fragmentScope() } + override val scope by fragmentScope() protected var binding: B? = null @@ -48,27 +48,6 @@ abstract class AbstractFragment(@LayoutRes layoutId: Int) : Frag */ abstract suspend fun setUpViewModelObserver() - /** - * Called to do initial creation of a fragment. This is called after - * [.onAttach] and before - * [.onCreateView]. - * - * - * Note that this can be called while the fragment's activity is - * still in the process of being created. As such, you can not rely - * on things like the activity's content view hierarchy being initialized - * at this point. If you want to do work once the activity itself is - * created, add a [androidx.lifecycle.LifecycleObserver] on the - * activity's Lifecycle, removing it when it receives the - * [Lifecycle.State.CREATED] callback. - * - * - * Any restored child fragments will be created before the base - * `Fragment.onCreate` method returns. - * - * @param savedInstanceState If the fragment is being re-created from - * a previous saved state, this is the state. - */ override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) lifecycleScope.launchWhenResumed { @@ -77,16 +56,6 @@ abstract class AbstractFragment(@LayoutRes layoutId: Int) : Frag initializeComponents(savedInstanceState) } - /** - * Called immediately after [.onCreateView] - * has returned, but before any saved state has been restored in to the view. - * This gives subclasses a chance to initialize themselves once - * they know their view hierarchy has been completely created. The fragment's - * view hierarchy is not however attached to its parent at this point. - * @param view The View returned by [.onCreateView]. - * @param savedInstanceState If non-null, this fragment is being re-constructed - * from a previous saved state as given here. - */ override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) viewModelObserverJob = lifecycleScope.launch { @@ -94,15 +63,6 @@ abstract class AbstractFragment(@LayoutRes layoutId: Int) : Frag } } - /** - * Called when the view previously created by [.onCreateView] has - * been detached from the fragment. The next time the fragment needs - * to be displayed, a new view will be created. This is called - * after [.onStop] and before [.onDestroy]. It is called - * *regardless* of whether [.onCreateView] returned a - * non-null view. Internally it is called after the view's state has - * been saved but before it has been removed from its parent. - */ override fun onDestroyView() { viewModelObserverJob?.cancel() super.onDestroyView() diff --git a/app/src/main/kotlin/co/anitrend/support/markdown/core/extensions/ContextExtensinos.kt b/app/src/main/kotlin/co/anitrend/support/markdown/core/extensions/ContextExtensinos.kt index f3e2c20..0d61bfd 100644 --- a/app/src/main/kotlin/co/anitrend/support/markdown/core/extensions/ContextExtensinos.kt +++ b/app/src/main/kotlin/co/anitrend/support/markdown/core/extensions/ContextExtensinos.kt @@ -8,12 +8,6 @@ import androidx.appcompat.widget.AppCompatTextView import io.noties.markwon.Markwon import me.saket.bettermovementmethod.BetterLinkMovementMethod -fun Context.displayWidth(): Int { - val metrics = DisplayMetrics() - display?.getRealMetrics(metrics) - return metrics.widthPixels -} - fun AppCompatTextView.setMarkdown(markwon: Markwon, text: String) { movementMethod = BetterLinkMovementMethod.newInstance().apply { setOnLinkClickListener { textView, url -> diff --git a/app/src/main/kotlin/co/anitrend/support/markdown/core/plugin/CoilImagePlugin.kt b/app/src/main/kotlin/co/anitrend/support/markdown/core/plugin/CoilImagePlugin.kt new file mode 100644 index 0000000..f1fcd12 --- /dev/null +++ b/app/src/main/kotlin/co/anitrend/support/markdown/core/plugin/CoilImagePlugin.kt @@ -0,0 +1,42 @@ +package co.anitrend.support.markdown.core.plugin + +import android.text.Spanned +import android.widget.TextView +import co.anitrend.support.markdown.core.plugin.loader.CoilAsyncDrawableLoader +import co.anitrend.support.markdown.core.plugin.store.CoilStore +import coil.ImageLoader +import io.noties.markwon.AbstractMarkwonPlugin +import io.noties.markwon.MarkwonConfiguration +import io.noties.markwon.MarkwonSpansFactory +import io.noties.markwon.image.AsyncDrawableScheduler +import io.noties.markwon.image.ImageSpanFactory +import org.commonmark.node.Image + +class CoilImagePlugin(coilStore: CoilStore, imageLoader: ImageLoader) : AbstractMarkwonPlugin() { + + private val coilAsyncDrawableLoader = + CoilAsyncDrawableLoader(coilStore, imageLoader) + + override fun configureSpansFactory(builder: MarkwonSpansFactory.Builder) { + builder.setFactory(Image::class.java, ImageSpanFactory()) + } + + override fun configureConfiguration(builder: MarkwonConfiguration.Builder) { + builder.asyncDrawableLoader(coilAsyncDrawableLoader) + } + + override fun beforeSetText(textView: TextView, markdown: Spanned) { + AsyncDrawableScheduler.unschedule(textView) + } + + override fun afterSetText(textView: TextView) { + AsyncDrawableScheduler.schedule(textView) + } + + companion object { + fun create( + coilStore: CoilStore, + imageLoader: ImageLoader + ) = CoilImagePlugin(coilStore, imageLoader) + } +} \ No newline at end of file diff --git a/app/src/main/kotlin/co/anitrend/support/markdown/core/plugin/loader/CoilAsyncDrawableLoader.kt b/app/src/main/kotlin/co/anitrend/support/markdown/core/plugin/loader/CoilAsyncDrawableLoader.kt new file mode 100644 index 0000000..4e86f24 --- /dev/null +++ b/app/src/main/kotlin/co/anitrend/support/markdown/core/plugin/loader/CoilAsyncDrawableLoader.kt @@ -0,0 +1,67 @@ +package co.anitrend.support.markdown.core.plugin.loader + +import android.graphics.drawable.AnimationDrawable +import android.graphics.drawable.Drawable +import co.anitrend.support.markdown.core.plugin.store.CoilStore +import co.anitrend.support.markdown.core.plugin.target.AsyncDrawableTarget +import coil.ImageLoader +import coil.request.Disposable +import coil.request.ImageRequest +import coil.target.Target +import io.noties.markwon.image.AsyncDrawable +import io.noties.markwon.image.AsyncDrawableLoader +import java.util.concurrent.atomic.AtomicBoolean + +class CoilAsyncDrawableLoader( + private val coilStore: CoilStore, + private val imageLoader: ImageLoader, + initialCache: Int = 8, +) : AsyncDrawableLoader() { + + private val cache: MutableMap = HashMap(initialCache) + + private fun AsyncDrawable.detach() { + with (result) { + if (this is AnimationDrawable) + stop() + } + + cache.remove(this)?.also(coilStore::cancel) + } + + private fun AsyncDrawable.attach(request: ImageRequest, loaded: AtomicBoolean) { + // @since 4.5.1 execute can return result _before_ disposable is created, + // thus `execute` would finish before we put disposable in cache (and thus result is + // not delivered) + // @since 4.5.1 execute can return result _before_ disposable is created, + // thus `execute` would finish before we put disposable in cache (and thus result is + // not delivered) + val disposable = imageLoader.enqueue(request) + + if (!loaded.get()) { + // mark flag + loaded.set(true) + cache[this] = disposable + } + } + + override fun load(drawable: AsyncDrawable) { + + val loaded = AtomicBoolean(false) + val target: Target = AsyncDrawableTarget(drawable, loaded, cache::remove) + val request = coilStore.load(drawable).newBuilder() + .target(target) + .build() + // if flag was not set, then job is running (else - finished before we got here) + // if flag was not set, then job is running (else - finished before we got here) + drawable.attach(request, loaded) + } + + override fun cancel(drawable: AsyncDrawable) { + drawable.detach() + } + + override fun placeholder(drawable: AsyncDrawable): Drawable? { + return null + } +} \ No newline at end of file diff --git a/app/src/main/kotlin/co/anitrend/support/markdown/core/plugin/store/CoilStore.kt b/app/src/main/kotlin/co/anitrend/support/markdown/core/plugin/store/CoilStore.kt new file mode 100644 index 0000000..28aa625 --- /dev/null +++ b/app/src/main/kotlin/co/anitrend/support/markdown/core/plugin/store/CoilStore.kt @@ -0,0 +1,13 @@ +package co.anitrend.support.markdown.core.plugin.store + +import coil.request.Disposable +import coil.request.ImageRequest +import io.noties.markwon.image.AsyncDrawable + +interface CoilStore { + fun load(drawable: AsyncDrawable): ImageRequest + fun cancel(disposable: Disposable) { + if (!disposable.isDisposed) + disposable.dispose() + } +} \ No newline at end of file diff --git a/app/src/main/kotlin/co/anitrend/support/markdown/core/plugin/CoilStorePlugin.kt b/app/src/main/kotlin/co/anitrend/support/markdown/core/plugin/store/CoilStorePlugin.kt similarity index 70% rename from app/src/main/kotlin/co/anitrend/support/markdown/core/plugin/CoilStorePlugin.kt rename to app/src/main/kotlin/co/anitrend/support/markdown/core/plugin/store/CoilStorePlugin.kt index b5356d9..47be189 100644 --- a/app/src/main/kotlin/co/anitrend/support/markdown/core/plugin/CoilStorePlugin.kt +++ b/app/src/main/kotlin/co/anitrend/support/markdown/core/plugin/store/CoilStorePlugin.kt @@ -1,20 +1,20 @@ -package co.anitrend.support.markdown.core.plugin +package co.anitrend.support.markdown.core.plugin.store +import android.annotation.SuppressLint import co.anitrend.support.markdown.sample.R import coil.request.Disposable import coil.request.ImageRequest -import coil.size.OriginalSize -import coil.size.PixelSize +import coil.size.Size import io.noties.markwon.image.AsyncDrawable -import io.noties.markwon.image.coil.CoilImagesPlugin /** * Taken from anitrend */ -internal class CoilStorePlugin private constructor( +class CoilStorePlugin private constructor( private val requestBuilder: ImageRequest.Builder -) : CoilImagesPlugin.CoilStore { +) : CoilStore { + @SuppressLint("NewApi") override fun load(drawable: AsyncDrawable): ImageRequest { val builder = requestBuilder .crossfade(true) @@ -26,22 +26,17 @@ internal class CoilStorePlugin private constructor( val height = drawable.imageSize?.height val size = if (width?.value != null && height?.value != null) { - PixelSize( + Size( width = width.value.toInt(), height = height.value.toInt() ) - } else OriginalSize + } else Size.ORIGINAL builder.size(size) return builder.build() } - override fun cancel(disposable: Disposable) { - if (!disposable.isDisposed) - disposable.dispose() - } - companion object { fun create( requestBuilder: ImageRequest.Builder diff --git a/app/src/main/kotlin/co/anitrend/support/markdown/core/plugin/target/AsyncDrawableTarget.kt b/app/src/main/kotlin/co/anitrend/support/markdown/core/plugin/target/AsyncDrawableTarget.kt new file mode 100644 index 0000000..782c344 --- /dev/null +++ b/app/src/main/kotlin/co/anitrend/support/markdown/core/plugin/target/AsyncDrawableTarget.kt @@ -0,0 +1,48 @@ +package co.anitrend.support.markdown.core.plugin.target + +import android.graphics.drawable.AnimationDrawable +import android.graphics.drawable.Drawable +import coil.request.Disposable +import coil.target.Target +import io.noties.markwon.image.AsyncDrawable +import io.noties.markwon.image.DrawableUtils +import java.util.concurrent.atomic.AtomicBoolean + +class AsyncDrawableTarget( + private val drawable: AsyncDrawable, + private val loaded: AtomicBoolean, + private val onRemove: (Drawable) -> Disposable? +) : Target { + + override fun onSuccess(result: Drawable) { + // @since 4.5.1 check finished flag (result can be delivered _before_ disposable is created) + if (onRemove(drawable) != null || !loaded.get()) { + // mark + loaded.set(true) + if (drawable.isAttached) { + DrawableUtils.applyIntrinsicBoundsIfEmpty(result) + drawable.result = result + with (drawable.result) { + if (this is AnimationDrawable) + start() + } + } + } + } + + override fun onStart(placeholder: Drawable?) { + if (placeholder != null && drawable.isAttached) { + DrawableUtils.applyIntrinsicBoundsIfEmpty(placeholder) + drawable.result = placeholder + } + } + + override fun onError(error: Drawable?) { + if (onRemove(drawable) != null) { + if (error != null && drawable.isAttached) { + DrawableUtils.applyIntrinsicBoundsIfEmpty(error) + drawable.result = error + } + } + } +} \ No newline at end of file diff --git a/app/src/main/kotlin/co/anitrend/support/markdown/data/FeedDataSource.kt b/app/src/main/kotlin/co/anitrend/support/markdown/data/FeedDataSource.kt index fc00614..2b0c6a4 100644 --- a/app/src/main/kotlin/co/anitrend/support/markdown/data/FeedDataSource.kt +++ b/app/src/main/kotlin/co/anitrend/support/markdown/data/FeedDataSource.kt @@ -2,11 +2,11 @@ package co.anitrend.support.markdown.data import androidx.paging.PagingSource import androidx.paging.PagingState +import co.anitrend.support.markdown.domain.entities.FeedListQuery import co.anitrend.support.markdown.domain.entities.TextFeed import co.anitrend.support.markdown.domain.model.TextFeedQuery -import com.apollographql.apollo.ApolloClient -import com.apollographql.apollo.api.Input -import com.apollographql.apollo.coroutines.await +import com.apollographql.apollo3.ApolloClient +import com.apollographql.apollo3.api.Optional import java.text.SimpleDateFormat import java.util.* @@ -27,18 +27,18 @@ internal class FeedDataSource( private fun convert(activities: List?): List { val result = activities?.filterNotNull()?.map { - val activity = requireNotNull(it.asTextActivity) + val activity = requireNotNull(it.onTextActivity) TextFeed( id = activity.id, text = activity.text.orEmpty(), createdAt = activity.createdAt.getDateTime(), user = activity.user!!.let { result -> TextFeed.User( - id = result.fragments.user.id, - name = result.fragments.user.name, + id = result.user.id, + name = result.user.name, avatar = TextFeed.User.Avatar( - large = result.fragments.user.avatar?.large, - medium = result.fragments.user.avatar?.medium + large = result.user.avatar?.onUserAvatar?.large, + medium = result.user.avatar?.onUserAvatar?.medium ), ) }, @@ -62,31 +62,6 @@ internal class FeedDataSource( else position.minus(1) } - /** - * Provide a [Key] used for the initial [load] for the next [PagingSource] due to invalidation - * of this [PagingSource]. The [Key] is provided to [load] via [LoadParams.key]. - * - * The [Key] returned by this method should cause [load] to load enough items to - * fill the viewport around the last accessed position, allowing the next generation to - * transparently animate in. The last accessed position can be retrieved via - * [state.anchorPosition][PagingState.anchorPosition], which is typically - * the top-most or bottom-most item in the viewport due to access being triggered by binding - * items as they scroll into view. - * - * For example, if items are loaded based on integer position keys, you can return - * [state.anchorPosition][PagingState.anchorPosition]. - * - * Alternately, if items contain a key used to load, get the key from the item in the page at - * index [state.anchorPosition][PagingState.anchorPosition]. - * - * @param state [PagingState] of the currently fetched data, which includes the most recently - * accessed position in the list via [PagingState.anchorPosition]. - * - * @return [Key] passed to [load] after invalidation used for initial load of the next - * generation. The [Key] returned by [getRefreshKey] should load pages centered around - * user's current viewport. If the correct [Key] cannot be determined, `null` can be returned - * to allow [load] decide what default key to use. - */ override fun getRefreshKey(state: PagingState): Int { return STARTING_PAGE } @@ -101,14 +76,14 @@ internal class FeedDataSource( val filter = FeedListQuery( page = position, perPage = query.pageSize, - asHtml = Input.optional(query.asHtml), - hasRepliesOrTypeText = Input.optional(query.hasRepliesOrTypeText), - userId = Input.optional(query.userId) + asHtml = Optional.present(query.asHtml), + hasRepliesOrTypeText = Optional.present(query.hasRepliesOrTypeText), + userId = Optional.presentIfNotNull(query.userId) ) return try { val request = client.query(filter) - val response = request.await() + val response = request.execute() if (response.hasErrors()) { val message = response.errors?.firstOrNull()?.message LoadResult.Error( @@ -116,7 +91,7 @@ internal class FeedDataSource( ) } else { - val page = requireNotNull(response.data?.page) + val page = requireNotNull(response.data?.Page) val textFeeds = convert(page.activities) val nextKey = createNextKey(textFeeds.size, page.pageInfo) diff --git a/app/src/main/kotlin/co/anitrend/support/markdown/data/koin/Modules.kt b/app/src/main/kotlin/co/anitrend/support/markdown/data/koin/Modules.kt index ad30256..8731fe5 100644 --- a/app/src/main/kotlin/co/anitrend/support/markdown/data/koin/Modules.kt +++ b/app/src/main/kotlin/co/anitrend/support/markdown/data/koin/Modules.kt @@ -3,7 +3,8 @@ package co.anitrend.support.markdown.data.koin import co.anitrend.support.markdown.data.repository.GetFeedTextPagedRepository import co.anitrend.support.markdown.data.usecase.TextFeedUseCase import co.anitrend.support.markdown.domain.interactor.GetTextFeedPaged -import com.apollographql.apollo.ApolloClient +import com.apollographql.apollo3.ApolloClient +import com.apollographql.apollo3.network.okHttpClient import okhttp3.OkHttpClient import org.koin.dsl.module import java.util.concurrent.TimeUnit @@ -33,7 +34,7 @@ private val networkModule = module { .build() } single { - ApolloClient.builder() + ApolloClient.Builder() .serverUrl("https://graphql.anilist.co") .okHttpClient(get()) .build() diff --git a/app/src/main/kotlin/co/anitrend/support/markdown/data/repository/GetFeedTextPagedRepository.kt b/app/src/main/kotlin/co/anitrend/support/markdown/data/repository/GetFeedTextPagedRepository.kt index ddee66a..e4a04ae 100644 --- a/app/src/main/kotlin/co/anitrend/support/markdown/data/repository/GetFeedTextPagedRepository.kt +++ b/app/src/main/kotlin/co/anitrend/support/markdown/data/repository/GetFeedTextPagedRepository.kt @@ -6,7 +6,7 @@ import androidx.paging.PagingData import co.anitrend.support.markdown.data.FeedDataSource import co.anitrend.support.markdown.domain.entities.TextFeed import co.anitrend.support.markdown.domain.model.TextFeedQuery -import com.apollographql.apollo.ApolloClient +import com.apollographql.apollo3.ApolloClient import kotlinx.coroutines.flow.Flow internal class GetFeedTextPagedRepository( diff --git a/app/src/main/kotlin/co/anitrend/support/markdown/sample/App.kt b/app/src/main/kotlin/co/anitrend/support/markdown/sample/App.kt index 1764dd5..90fc83a 100644 --- a/app/src/main/kotlin/co/anitrend/support/markdown/sample/App.kt +++ b/app/src/main/kotlin/co/anitrend/support/markdown/sample/App.kt @@ -7,34 +7,10 @@ import coil.ImageLoaderFactory import org.koin.android.ext.android.get import org.koin.android.ext.koin.androidContext import org.koin.androidx.fragment.koin.fragmentFactory -import org.koin.core.KoinExperimentalAPI import org.koin.core.context.startKoin class App : Application(), ImageLoaderFactory { - /** - * Called when the application is starting, before any activity, service, - * or receiver objects (excluding content providers) have been created. - * - * - * Implementations should be as quick as possible (for example using - * lazy initialization of state) since the time spent in this function - * directly impacts the performance of starting the first activity, - * service, or receiver in a process. - * - * - * If you override this method, be sure to call `super.onCreate()`. - * - * - * Be aware that direct boot may also affect callback order on - * Android [android.os.Build.VERSION_CODES.N] and later devices. - * Until the user unlocks the device, only direct boot aware components are - * allowed to run. You should consider that all direct boot unaware - * components, including such [android.content.ContentProvider], are - * disabled until user unlock happens, especially when component callback - * order matters. - */ - @KoinExperimentalAPI override fun onCreate() { super.onCreate() startKoin { diff --git a/app/src/main/kotlin/co/anitrend/support/markdown/sample/koin/Modules.kt b/app/src/main/kotlin/co/anitrend/support/markdown/sample/koin/Modules.kt index 52cbb85..148b871 100644 --- a/app/src/main/kotlin/co/anitrend/support/markdown/sample/koin/Modules.kt +++ b/app/src/main/kotlin/co/anitrend/support/markdown/sample/koin/Modules.kt @@ -4,7 +4,8 @@ import android.os.Build.VERSION.SDK_INT import android.util.Log import co.anitrend.support.markdown.center.CenterPlugin import co.anitrend.support.markdown.core.CorePlugin -import co.anitrend.support.markdown.core.plugin.CoilStorePlugin +import co.anitrend.support.markdown.core.plugin.CoilImagePlugin +import co.anitrend.support.markdown.core.plugin.store.CoilStorePlugin import co.anitrend.support.markdown.data.koin.dataModules import co.anitrend.support.markdown.ephasis.EmphasisPlugin import co.anitrend.support.markdown.heading.HeadingPlugin @@ -22,19 +23,18 @@ import co.anitrend.support.markdown.spoiler.SpoilerPlugin import co.anitrend.support.markdown.strike.StrikeThroughPlugin import co.anitrend.support.markdown.webm.WebMPlugin import co.anitrend.support.markdown.youtube.YouTubePlugin -import coil.Coil import coil.ImageLoader import coil.decode.GifDecoder import coil.decode.ImageDecoderDecoder +import coil.disk.DiskCache +import coil.imageLoader import coil.request.ImageRequest import coil.transform.RoundedCornersTransformation -import coil.util.CoilUtils import io.noties.markwon.AbstractMarkwonPlugin import io.noties.markwon.Markwon import io.noties.markwon.ext.strikethrough.StrikethroughPlugin import io.noties.markwon.ext.tasklist.TaskListPlugin import io.noties.markwon.html.HtmlPlugin -import io.noties.markwon.image.coil.CoilImagesPlugin import io.noties.markwon.linkify.LinkifyPlugin import okhttp3.OkHttpClient import org.koin.android.ext.koin.androidContext @@ -74,12 +74,12 @@ private val coreModule = module { .usePlugin(TaskListPlugin.create(context)) .usePlugin(ItalicsPlugin.create()) .usePlugin( - CoilImagesPlugin.create( + CoilImagePlugin.create( CoilStorePlugin.create( ImageRequest.Builder(context) .transformations(RoundedCornersTransformation(radius)) ), - Coil.imageLoader(context) + context.imageLoader ) ) .usePlugin(object : AbstractMarkwonPlugin() { @@ -117,18 +117,20 @@ private val imageLoaderModule = module { val context = androidContext() ImageLoader.Builder(context) .crossfade(true) + .diskCache { + DiskCache.Builder() + .directory(context.cacheDir) + .build() + } .okHttpClient { OkHttpClient.Builder() - .cache( - CoilUtils.createDefaultCache(context) - ) .build() } - .componentRegistry { + .components { if (SDK_INT >= 28) - add(ImageDecoderDecoder()) + add(ImageDecoderDecoder.Factory()) else - add(GifDecoder()) + add(GifDecoder.Factory()) }.build() } } diff --git a/build.gradle.kts b/build.gradle.kts index 2999bc7..6907664 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,36 +1,20 @@ -import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask - -plugins { - id("com.github.ben-manes.versions") -} - buildscript { repositories { google() - jcenter() mavenCentral() } dependencies { - classpath(co.anitrend.support.markdown.buildSrc.Libraries.Android.Tools.buildGradle) - classpath(co.anitrend.support.markdown.buildSrc.Libraries.JetBrains.Kotlin.Gradle.plugin) - classpath(co.anitrend.support.markdown.buildSrc.Libraries.Apollo.Gradle.plugin) - classpath(co.anitrend.support.markdown.buildSrc.Libraries.Koin.Gradle.plugin) + classpath(libs.android.gradle.plugin) + classpath(libs.jetbrains.kotlin.gradle) } } allprojects { repositories { google() - jcenter() mavenCentral() maven { - url = java.net.URI(co.anitrend.support.markdown.buildSrc.Libraries.Repositories.jitPack) - } - maven { - url = java.net.URI(co.anitrend.support.markdown.buildSrc.Libraries.Repositories.dependencyUpdates) - } - maven { - url = java.net.URI(co.anitrend.support.markdown.buildSrc.Libraries.Repositories.markdown) + setUrl("https://www.jitpack.io") } } } @@ -40,13 +24,3 @@ tasks { delete(rootProject.buildDir) } } - -tasks.named( - "dependencyUpdates", - DependencyUpdatesTask::class.java -).configure { - checkForGradleUpdate = false - outputFormatter = "json" - outputDir = "build/dependencyUpdates" - reportfileName = "report" -} diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index f1e976d..fc8de67 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -1,38 +1,55 @@ -import java.net.URI +import org.gradle.accessors.dm.LibrariesForLibs +import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile plugins { `kotlin-dsl` `maven-publish` + `version-catalog` } repositories { google() jcenter() mavenCentral() + gradlePluginPortal() maven { - url = URI("https://www.jitpack.io") + setUrl("https://plugins.gradle.org/m2/") } + maven { + setUrl("https://www.jitpack.io") + } +} + +tasks.withType(KotlinJvmCompile::class.java) { + kotlinOptions { + jvmTarget = "11" + } +} + +java { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } -val buildToolsVersion = "7.0.2" -val kotlinVersion = "1.4.32" -val dokkaVersion = "1.4.30" -val manesVersion = "0.33.0" +val libs = extensions.getByType() dependencies { - /* Depend on the android gradle plugin, since we want to access it in our plugin */ - implementation("com.android.tools.build:gradle:$buildToolsVersion") + /** Depend on the android gradle plugin, since we want to access it in our plugin */ + implementation(libs.android.gradle.plugin) - /* Depend on the kotlin plugin, since we want to access it in our plugin */ - implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") + /** Depend on the kotlin plugin, since we want to access it in our plugin */ + implementation(libs.jetbrains.kotlin.gradle) - /* Depend on the dokka plugin, since we want to access it in our plugin */ - implementation("org.jetbrains.dokka:dokka-gradle-plugin:$dokkaVersion") + /** Depend on the dokka plugin, since we want to access it in our plugin */ + implementation(libs.jetbrains.dokka.gradle) - /** Dependency management */ - implementation("com.github.ben-manes:gradle-versions-plugin:$manesVersion") + /** Spotless */ + implementation(libs.spotless.gradle) /* Depend on the default Gradle API's since we want to build a custom plugin */ implementation(gradleApi()) implementation(localGroovy()) + + /** Work around to include ../.gradle/LibrariesForLibs generated file for version catalog */ + implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location)) } \ No newline at end of file diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts new file mode 100644 index 0000000..4d2de53 --- /dev/null +++ b/buildSrc/settings.gradle.kts @@ -0,0 +1,9 @@ +@file:Suppress("UnstableApiUsage") + +dependencyResolutionManagement { + versionCatalogs { + create("libs") { + from(files("../gradle/libs.versions.toml")) + } + } +} \ No newline at end of file diff --git a/buildSrc/src/main/java/co/anitrend/support/markdown/buildSrc/Libraries.kt b/buildSrc/src/main/java/co/anitrend/support/markdown/buildSrc/Libraries.kt deleted file mode 100644 index 2289e47..0000000 --- a/buildSrc/src/main/java/co/anitrend/support/markdown/buildSrc/Libraries.kt +++ /dev/null @@ -1,230 +0,0 @@ -package co.anitrend.support.markdown.buildSrc - -import co.anitrend.support.markdown.buildSrc.common.Versions - -object Libraries { - const val timber = "com.jakewharton.timber:timber:${Versions.timber}" - - const val betterLinkMovement = "me.saket:better-link-movement-method:${Versions.betterLinkMovement}" - - const val junit = "junit:junit:${Versions.junit}" - const val mockk = "io.mockk:mockk:${Versions.mockk}" - - const val elements = "com.otaliastudios:elements:${Versions.elements}" - - - object Repositories { - const val jitPack = "https://www.jitpack.io" - const val markdown = "https://dl.bintray.com/jetbrains/markdown" - const val dependencyUpdates = "https://dl.bintray.com/pdvrieze/maven" - } - - object Android { - - object Tools { - private const val version = "7.0.2" - const val buildGradle = "com.android.tools.build:gradle:$version" - } - } - - object AndroidX { - - object Activity { - private const val version = "1.2.0" - const val activity = "androidx.activity:activity:$version" - const val activityKtx = "androidx.activity:activity-ktx:$version" - } - - object Collection { - private const val version = "1.1.0" - const val collection = "androidx.collection:collection:$version" - const val collectionKtx = "androidx.collection:collection-ktx:$version" - } - - object Core { - private const val version = "1.5.0-beta02" - const val core = "androidx.core:core:$version" - const val coreKtx = "androidx.core:core-ktx:$version" - } - - object ConstraintLayout { - private const val version = "2.0.0" - const val constraintLayout = "androidx.constraintlayout:constraintlayout:$version" - const val constraintLayoutSolver = "androidx.constraintlayout:constraintlayout-solver:$version" - } - - object Fragment { - private const val version = "1.3.2" - const val fragment = "androidx.fragment:fragment:$version" - const val fragmentKtx = "androidx.fragment:fragment-ktx:$version" - const val test = "androidx.fragment:fragment-ktx:fragment-testing$version" - } - - object Lifecycle { - private const val version = "2.3.0" - const val extensions = "androidx.lifecycle:lifecycle-extensions:2.2.0" - const val runTimeKtx = "androidx.lifecycle:lifecycle-runtime-ktx:$version" - const val liveDataKtx = "androidx.lifecycle:lifecycle-livedata-ktx:$version" - const val viewModelKtx = "androidx.lifecycle:lifecycle-viewmodel-ktx:$version" - const val liveDataCoreKtx = "androidx.lifecycle:lifecycle-livedata-core-ktx:$version" - } - - object Paging { - private const val version = "3.0.0-beta03" - const val common = "androidx.paging:paging-common-ktx:$version" - const val runtime = "androidx.paging:paging-runtime:$version" - const val runtimeKtx = "androidx.paging:paging-runtime-ktx:$version" - } - - object Preference { - private const val version = "1.1.0" - const val preference = "androidx.preference:preference:$version" - const val preferenceKtx = "androidx.preference:preference-ktx:$version" - } - - object Recycler { - private const val version = "1.2.0-beta02" - const val recyclerView = "androidx.recyclerview:recyclerview:$version" - const val recyclerViewSelection = "androidx.recyclerview:recyclerview-selection:$version" - } - - object SwipeRefresh { - private const val version = "1.1.0-rc01" - const val swipeRefreshLayout = "androidx.swiperefreshlayout:swiperefreshlayout:$version" - } - - object Test { - private const val version = "1.3.0" - const val core = "androidx.test:core:$version" - const val coreKtx = "androidx.test:core-ktx:$version" - const val runner = "androidx.test:runner:$version" - const val rules = "androidx.test:rules:$version" - - object Espresso { - private const val version = "3.3.0" - const val core = "androidx.test.espresso:espresso-core:$version" - } - - object Extension { - private const val version = "1.1.2" - const val junit = "androidx.test.ext:junit:$version" - const val junitKtx = "androidx.test.ext:junit-ktx:$version" - } - } - } - - object Apollo { - private const val version = "2.5.5" - const val runtime = "com.apollographql.apollo:apollo-runtime:$version" - const val android = "com.apollographql.apollo:apollo-android-support:$version" - const val coroutines = "com.apollographql.apollo:apollo-coroutines-support:$version" - - object Gradle { - const val plugin = "com.apollographql.apollo:apollo-gradle-plugin:$version" - } - } - - object CashApp { - object Turbine { - private const val version = "0.4.1" - const val turbine = "app.cash.turbine:turbine:$version" - } - } - - object Coil { - private const val version = "1.1.1" - const val coil = "io.coil-kt:coil:$version" - const val base = "io.coil-kt:coil-base:$version" - const val gif = "io.coil-kt:coil-gif:$version" - const val svg = "io.coil-kt:coil-svg:$version" - const val video = "io.coil-kt:coil-video:$version" - } - - object Google { - - object Material { - private const val version = "1.3.0" - const val material = "com.google.android.material:material:$version" - } - } - - object JetBrains { - - object Dokka { - private const val version = "1.4.30" - const val gradlePlugin = "org.jetbrains.dokka:dokka-gradle-plugin:$version" - } - - object Markdown { - private const val version = "0.2.1" - const val markdown = "org.jetbrains:markdown:$version" - } - - object Kotlin { - private const val version = "1.4.32" - const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version" - const val reflect = "org.jetbrains.kotlin:kotlin-reflect:$version" - - object Gradle { - const val plugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version" - const val serialization = "org.jetbrains.kotlin:kotlin-serialization:$version" - } - - object Android { - const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version" - } - } - - object KotlinX { - object Coroutines { - private const val version = "1.3.8" - const val core = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$version" - const val android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$version" - const val test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$version" - } - - object Serialization { - private const val version = "0.20.0" - const val runtime = "org.jetbrains.kotlinx:kotlinx-serialization-runtime:$version" - } - } - } - - object Koin { - private const val version = "2.2.1" - const val core = "org.koin:koin-core:$version" - const val extension = "org.koin:koin-core-ext:$version" - const val test = "org.koin:koin-test:$version" - - object AndroidX { - const val scope = "org.koin:koin-androidx-scope:$version" - const val fragment = "org.koin:koin-androidx-fragment:$version" - const val viewmodel = "org.koin:koin-androidx-viewmodel:$version" - } - - object Gradle { - const val plugin = "org.koin:koin-gradle-plugin:$version" - } - } - - object Markwon { - private const val version = "4.6.2" - const val core = "io.noties.markwon:core:$version" - const val editor = "io.noties.markwon:editor:$version" - const val html = "io.noties.markwon:html:$version" - const val image = "io.noties.markwon:image:$version" - const val glide = "io.noties.markwon:image-glide:$version" - const val coil = "io.noties.markwon:image-coil:$version" - const val parser = "io.noties.markwon:inline-parser:$version" - const val linkify = "io.noties.markwon:linkify:$version" - const val simpleExt = "io.noties.markwon:simple-ext:$version" - const val syntaxHighlight = "io.noties.markwon:syntax-highlight:$version" - - object Extension { - const val taskList = "io.noties.markwon:ext-tasklist:$version" - const val strikeThrough = "io.noties.markwon:ext-strikethrough:$version" - const val tables = "io.noties.markwon:ext-tables:$version" - const val latex = "io.noties.markwon:ext-latex:$version" - } - } -} diff --git a/buildSrc/src/main/java/co/anitrend/support/markdown/buildSrc/common/Configuration.kt b/buildSrc/src/main/java/co/anitrend/support/markdown/buildSrc/common/Configuration.kt new file mode 100644 index 0000000..2ff3962 --- /dev/null +++ b/buildSrc/src/main/java/co/anitrend/support/markdown/buildSrc/common/Configuration.kt @@ -0,0 +1,7 @@ +package co.anitrend.support.markdown.buildSrc.common + +object Configuration { + const val compileSdk = 33 + const val targetSdk = 33 + const val minSdk = 21 +} \ No newline at end of file diff --git a/buildSrc/src/main/java/co/anitrend/support/markdown/buildSrc/common/Versions.kt b/buildSrc/src/main/java/co/anitrend/support/markdown/buildSrc/common/Versions.kt deleted file mode 100644 index 64197a4..0000000 --- a/buildSrc/src/main/java/co/anitrend/support/markdown/buildSrc/common/Versions.kt +++ /dev/null @@ -1,41 +0,0 @@ -package co.anitrend.support.markdown.buildSrc.common - -object Versions { - private const val major = 0 - private const val minor = 12 - private const val patch = 1 - private const val candidate = 0 - - private const val channel = "alpha" - - const val compileSdk = 30 - const val targetSdk = 30 - const val minSdk = 21 - - /** - * **RR**_X.Y.Z_ - * > **RR** reserved for build flavours and **X.Y.Z** follow the [versionName] convention - */ - const val versionCode = major.times(10_000) + - minor.times(1000) + - patch.times(100) + - candidate.times(10) - - /** - * Naming schema: X.Y.Z-variant## - * > **X**(Major).**Y**(Minor).**Z**(Patch) - */ - val versionName = if (candidate > 0) - "$major.$minor.$patch-$channel$candidate" - else - "$major.$minor.$patch" - - const val mockk = "1.11.0" - const val junit = "4.13.2" - - const val timber = "4.7.1" - - const val betterLinkMovement = "2.2.0" - - const val elements = "1.0.1" -} diff --git a/buildSrc/src/main/java/co/anitrend/support/markdown/buildSrc/plugin/components/AndroidConfiguration.kt b/buildSrc/src/main/java/co/anitrend/support/markdown/buildSrc/plugin/components/AndroidConfiguration.kt index 33d8ecb..a97cd45 100644 --- a/buildSrc/src/main/java/co/anitrend/support/markdown/buildSrc/plugin/components/AndroidConfiguration.kt +++ b/buildSrc/src/main/java/co/anitrend/support/markdown/buildSrc/plugin/components/AndroidConfiguration.kt @@ -1,16 +1,43 @@ package co.anitrend.support.markdown.buildSrc.plugin.components -import co.anitrend.support.markdown.buildSrc.common.Versions +import co.anitrend.support.markdown.buildSrc.common.Configuration import co.anitrend.support.markdown.buildSrc.common.isSampleModule import co.anitrend.support.markdown.buildSrc.plugin.extensions.baseAppExtension import co.anitrend.support.markdown.buildSrc.plugin.extensions.baseExtension +import co.anitrend.support.markdown.buildSrc.plugin.extensions.libraryExtension +import co.anitrend.support.markdown.buildSrc.plugin.extensions.libs +import co.anitrend.support.markdown.buildSrc.plugin.extensions.releaseProperties +import co.anitrend.support.markdown.buildSrc.plugin.extensions.spotlessExtension import com.android.build.gradle.internal.dsl.DefaultConfig import org.gradle.api.JavaVersion import org.gradle.api.Project import org.jetbrains.kotlin.gradle.dsl.KotlinCompile -import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile +import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile import java.io.File +private fun Project.configureLint() = libraryExtension().run { + lint { + abortOnError = false + ignoreWarnings = false + ignoreTestSources = true + } +} + +internal fun Project.configureSpotless(): Unit = spotlessExtension().run { + kotlin { + target("**/*.kt") + targetExclude( + "$buildDir/**/*.kt", + "**/androidTest/**/*.kt", + "**/test/**/*.kt", + "bin/**/*.kt" + ) + ktlint(libs.versions.ktlint.get()).userData( + mapOf("android" to "true") + ) + } +} + @Suppress("UnstableApiUsage") private fun DefaultConfig.applyAdditionalConfiguration(project: Project) { if (project.isSampleModule()) { @@ -27,12 +54,12 @@ private fun DefaultConfig.applyAdditionalConfiguration(project: Project) { } internal fun Project.configureAndroid(): Unit = baseExtension().run { - compileSdkVersion(Versions.compileSdk) + compileSdkVersion(Configuration.compileSdk) defaultConfig { - minSdk = Versions.minSdk - targetSdk = Versions.targetSdk - versionCode = Versions.versionCode - versionName = Versions.versionName + minSdk = Configuration.minSdk + targetSdk = Configuration.targetSdk + versionCode = releaseProperties["code"] as? Int + versionName = releaseProperties["version"] as? String testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" applyAdditionalConfiguration(project) } @@ -50,10 +77,8 @@ internal fun Project.configureAndroid(): Unit = baseExtension().run { } } - packagingOptions { - excludes.add("META-INF/NOTICE.txt") - excludes.add("META-INF/LICENSE") - excludes.add("META-INF/LICENSE.txt") + if (!project.isSampleModule()) { + configureLint() } sourceSets { @@ -74,15 +99,9 @@ internal fun Project.configureAndroid(): Unit = baseExtension().run { unitTests.isReturnDefaultValues = true } - lintOptions { - isAbortOnError = false - isIgnoreWarnings = false - isIgnoreTestSources = true - } - compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } tasks.withType(KotlinCompile::class.java) { @@ -91,19 +110,14 @@ internal fun Project.configureAndroid(): Unit = baseExtension().run { kotlinOptions { allWarningsAsErrors = false // Filter out modules that won't be using coroutines - freeCompilerArgs = if (isSampleModule()) listOf( - "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi", - "-Xopt-in=kotlinx.coroutines.FlowPreview", - "-Xopt-in=kotlinx.coroutines.FlowPreview", - "-Xopt-in=kotlin.Experimental" - ) else listOf("-Xopt-in=kotlin.Experimental") + freeCompilerArgs = listOf("-Xopt-in=kotlin.Experimental") } } } tasks.withType(KotlinJvmCompile::class.java) { kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "11" } } } \ No newline at end of file diff --git a/buildSrc/src/main/java/co/anitrend/support/markdown/buildSrc/plugin/components/AndroidDependencies.kt b/buildSrc/src/main/java/co/anitrend/support/markdown/buildSrc/plugin/components/AndroidDependencies.kt index de05c23..618314a 100644 --- a/buildSrc/src/main/java/co/anitrend/support/markdown/buildSrc/plugin/components/AndroidDependencies.kt +++ b/buildSrc/src/main/java/co/anitrend/support/markdown/buildSrc/plugin/components/AndroidDependencies.kt @@ -1,11 +1,12 @@ package co.anitrend.support.markdown.buildSrc.plugin.components import co.anitrend.support.markdown.buildSrc.plugin.strategy.DependencyStrategy +import co.anitrend.support.markdown.buildSrc.plugin.extensions.implementation import org.gradle.api.Project internal fun Project.configureDependencies() { - val dependencyStrategy = DependencyStrategy(project.name) - dependencies.add("implementation", + val dependencyStrategy = DependencyStrategy(project) + dependencies.implementation( fileTree("libs") { include("*.jar") } diff --git a/buildSrc/src/main/java/co/anitrend/support/markdown/buildSrc/plugin/components/AndroidOptions.kt b/buildSrc/src/main/java/co/anitrend/support/markdown/buildSrc/plugin/components/AndroidOptions.kt index 9d30d6a..ce11ba1 100644 --- a/buildSrc/src/main/java/co/anitrend/support/markdown/buildSrc/plugin/components/AndroidOptions.kt +++ b/buildSrc/src/main/java/co/anitrend/support/markdown/buildSrc/plugin/components/AndroidOptions.kt @@ -1,9 +1,9 @@ package co.anitrend.support.markdown.buildSrc.plugin.components -import co.anitrend.support.markdown.buildSrc.common.Versions import co.anitrend.support.markdown.buildSrc.common.isLibraryModule import co.anitrend.support.markdown.buildSrc.plugin.extensions.baseExtension import co.anitrend.support.markdown.buildSrc.plugin.extensions.publishingExtension +import co.anitrend.support.markdown.buildSrc.plugin.extensions.releaseProperties import com.android.build.gradle.internal.dsl.BuildType import org.gradle.api.Project import org.gradle.api.publish.maven.MavenPublication @@ -45,9 +45,9 @@ internal fun Project.configureOptions() { println("Configuring maven publication options for ${project.path}:maven with component -> ${component?.name}") create("maven", MavenPublication::class.java) { - groupId = "co.anitrend.query.builder" + groupId = "co.anitrend.markdown" artifactId = project.name - version = Versions.versionName + version = releaseProperties["version"] as? String artifact(sourcesJar) artifact("${project.buildDir}/outputs/aar/${project.name}-release.aar") diff --git a/buildSrc/src/main/java/co/anitrend/support/markdown/buildSrc/plugin/components/AndroidPlugins.kt b/buildSrc/src/main/java/co/anitrend/support/markdown/buildSrc/plugin/components/AndroidPlugins.kt index 9a8f359..ff57d54 100644 --- a/buildSrc/src/main/java/co/anitrend/support/markdown/buildSrc/plugin/components/AndroidPlugins.kt +++ b/buildSrc/src/main/java/co/anitrend/support/markdown/buildSrc/plugin/components/AndroidPlugins.kt @@ -5,6 +5,7 @@ import co.anitrend.support.markdown.buildSrc.common.isSampleModule import org.gradle.api.Project private fun Project.applyModulePlugin() { + plugins.apply("com.diffplug.spotless") if (isLibraryModule()) { plugins.apply("com.android.library") plugins.apply("org.jetbrains.dokka") @@ -19,6 +20,5 @@ internal fun Project.configurePlugins() { plugins.apply("kotlin-android") if (isSampleModule()) { plugins.apply("kotlin-kapt") - plugins.apply("com.apollographql.apollo") } } \ No newline at end of file diff --git a/buildSrc/src/main/java/co/anitrend/support/markdown/buildSrc/plugin/extensions/DependencyHandlerExtensions.kt b/buildSrc/src/main/java/co/anitrend/support/markdown/buildSrc/plugin/extensions/DependencyHandlerExtensions.kt new file mode 100644 index 0000000..23aa1bd --- /dev/null +++ b/buildSrc/src/main/java/co/anitrend/support/markdown/buildSrc/plugin/extensions/DependencyHandlerExtensions.kt @@ -0,0 +1,225 @@ +package co.anitrend.support.markdown.buildSrc.plugin.extensions + + +import org.gradle.api.artifacts.* +import org.gradle.kotlin.dsl.exclude +import org.gradle.api.artifacts.dsl.DependencyHandler + +private enum class DependencyType(val configurationName: String) { + API("api"), + COMPILE("compileOnly"), + DEBUG("debugOnly"), + KAPT("kapt"), + IMPLEMENTATION("implementation"), + DEBUG_IMPLEMENTATION("debugImplementation"), + RELEASE_IMPLEMENTATION("releaseImplementation"), + RUNTIME("runtimeOnly"), + TEST("testImplementation"), + ANDROID_TEST("androidTestImplementation") +} + +/** + * Adds a dependency to the given configuration, and configures the dependency using the given expression. + * + * @param configuration The name of the configuration. + * @param dependency The dependency. + * @param dependencyConfiguration The expression to use to configure the dependency. + * @return The dependency. + */ +private inline fun DependencyHandler.add( + configuration: String, + dependency: T, + dependencyConfiguration: T.() -> Unit +): T = dependency.apply { + dependencyConfiguration() + add(configuration, this) +} + + +/** + * Adds a dependency to the given configuration, and configures the dependency using the given expression. + * + * @param configuration The name of the configuration. + * @param dependencyNotation The dependency notation. + * @param dependencyConfiguration The expression to use to configure the dependency. + * @return The dependency. + */ +private inline fun DependencyHandler.add( + configuration: String, + dependencyNotation: String, + dependencyConfiguration: ExternalModuleDependency.() -> Unit +): Dependency = add( + configuration, + create(dependencyNotation) as ExternalModuleDependency, + dependencyConfiguration +) + + +/** + * Adds an exclude rule to exclude transitive dependencies of this dependency. + * + * Excluding a particular transitive dependency does not guarantee that it does not show up + * in the dependencies of a given configuration. + * For example, some other dependency, which does not have any exclude rules, + * might pull in exactly the same transitive dependency. + * To guarantee that the transitive dependency is excluded from the entire configuration + * please use per-configuration exclude rules: [Configuration.getExcludeRules]. + * In fact, in majority of cases the actual intention of configuring per-dependency exclusions + * is really excluding a dependency from the entire configuration (or classpath). + * + * If your intention is to exclude a particular transitive dependency + * because you don't like the version it pulls in to the configuration + * then consider using the forced versions feature: [ResolutionStrategy.force]. + * + * @param group the optional group identifying the dependencies to be excluded. + * @param module the optional module name identifying the dependencies to be excluded. + * @return this + * + * @see [ModuleDependency.exclude] + */ +@Suppress("UNCHECKED_CAST") +fun T.exclude(group: String? = null, module: String? = null): T = + exclude(mapOf("group" to group, "module" to module)) as T + +private fun DependencyHandler.addDependency( + dependencyNotation: Any, + dependencyType: DependencyType, + dependencyConfiguration: (ExternalModuleDependency.() -> Unit)? = null +) = when (dependencyConfiguration) { + null -> add(dependencyType.configurationName, dependencyNotation) + else -> add( + configuration = dependencyType.configurationName, + dependencyNotation = dependencyNotation.toString(), + dependencyConfiguration = dependencyConfiguration + ) +} + +/** + * Adds a dependency to the given configuration, and configures the dependency using the given closure. + * + * @param dependencyNotation The dependency notation, in one of the notations described above. + * @param dependencyConfiguration The closure to use to configure the dependency. + * + * @return The dependency. + */ +internal fun DependencyHandler.kapt( + dependencyNotation: Any, + dependencyConfiguration: (ExternalModuleDependency.() -> Unit)? = null +) = addDependency(dependencyNotation, DependencyType.KAPT, dependencyConfiguration) + +/** + * Adds a dependency to the given configuration, and configures the dependency using the given closure. + * + * @param dependencyNotation The dependency notation, in one of the notations described above. + * @param dependencyConfiguration The closure to use to configure the dependency. + * + * @return The dependency. + */ +internal fun DependencyHandler.api( + dependencyNotation: Any, + dependencyConfiguration: (ExternalModuleDependency.() -> Unit)? = null +) = addDependency(dependencyNotation, DependencyType.API, dependencyConfiguration) + +/** + * Adds a dependency to the given configuration, and configures the dependency using the given closure. + * + * @param dependencyNotation The dependency notation, in one of the notations described above. + * @param dependencyConfiguration The closure to use to configure the dependency. + * + * @return The dependency. + */ +internal fun DependencyHandler.compile( + dependencyNotation: Any, + dependencyConfiguration: (ExternalModuleDependency.() -> Unit)? = null +) = addDependency(dependencyNotation, DependencyType.COMPILE, dependencyConfiguration) + +/** + * Adds a dependency to the given configuration, and configures the dependency using the given closure. + * + * @param dependencyNotation The dependency notation, in one of the notations described above. + * @param dependencyConfiguration The closure to use to configure the dependency. + * + * @return The dependency. + */ +internal fun DependencyHandler.debug( + dependencyNotation: Any, + dependencyConfiguration: (ExternalModuleDependency.() -> Unit)? = null +) = addDependency(dependencyNotation, DependencyType.DEBUG, dependencyConfiguration) + +/** + * Adds a dependency to the given configuration, and configures the dependency using the given closure. + * + * @param dependencyNotation The dependency notation, in one of the notations described above. + * @param dependencyConfiguration The closure to use to configure the dependency. + * + * @return The dependency. + */ +internal fun DependencyHandler.implementation( + dependencyNotation: Any, + dependencyConfiguration: (ExternalModuleDependency.() -> Unit)? = null +) = addDependency(dependencyNotation, DependencyType.IMPLEMENTATION, dependencyConfiguration) + +/** + * Adds a dependency to the given configuration, and configures the dependency using the given closure. + * + * @param dependencyNotation The dependency notation, in one of the notations described above. + * @param dependencyConfiguration The closure to use to configure the dependency. + * + * @return The dependency. + */ +internal fun DependencyHandler.debugImplementation( + dependencyNotation: Any, + dependencyConfiguration: (ExternalModuleDependency.() -> Unit)? = null +) = addDependency(dependencyNotation, DependencyType.DEBUG_IMPLEMENTATION, dependencyConfiguration) + +/** + * Adds a dependency to the given configuration, and configures the dependency using the given closure. + * + * @param dependencyNotation The dependency notation, in one of the notations described above. + * @param dependencyConfiguration The closure to use to configure the dependency. + * + * @return The dependency. + */ +internal fun DependencyHandler.releaseImplementation( + dependencyNotation: Any, + dependencyConfiguration: (ExternalModuleDependency.() -> Unit)? = null +) = addDependency(dependencyNotation, DependencyType.RELEASE_IMPLEMENTATION, dependencyConfiguration) + +/** + * Adds a dependency to the given configuration, and configures the dependency using the given closure. + * + * @param dependencyNotation The dependency notation, in one of the notations described above. + * @param dependencyConfiguration The closure to use to configure the dependency. + * + * @return The dependency. + */ +internal fun DependencyHandler.runtime( + dependencyNotation: Any, + dependencyConfiguration: (ExternalModuleDependency.() -> Unit)? = null +) = addDependency(dependencyNotation, DependencyType.RUNTIME, dependencyConfiguration) + +/** + * Adds a dependency to the given configuration, and configures the dependency using the given closure. + * + * @param dependencyNotation The dependency notation, in one of the notations described above. + * @param dependencyConfiguration The closure to use to configure the dependency. + * + * @return The dependency. + */ +internal fun DependencyHandler.test( + dependencyNotation: Any, + dependencyConfiguration: (ExternalModuleDependency.() -> Unit)? = null +) = addDependency(dependencyNotation, DependencyType.TEST, dependencyConfiguration) + +/** + * Adds a dependency to the given configuration, and configures the dependency using the given closure. + * + * @param dependencyNotation The dependency notation, in one of the notations described above. + * @param dependencyConfiguration The closure to use to configure the dependency. + * + * @return The dependency. + */ +internal fun DependencyHandler.androidTest( + dependencyNotation: Any, + dependencyConfiguration: (ExternalModuleDependency.() -> Unit)? = null +) = addDependency(dependencyNotation, DependencyType.ANDROID_TEST, dependencyConfiguration) diff --git a/buildSrc/src/main/java/co/anitrend/support/markdown/buildSrc/plugin/extensions/ProjectExtensions.kt b/buildSrc/src/main/java/co/anitrend/support/markdown/buildSrc/plugin/extensions/ProjectExtensions.kt index a7bcce3..412f4eb 100644 --- a/buildSrc/src/main/java/co/anitrend/support/markdown/buildSrc/plugin/extensions/ProjectExtensions.kt +++ b/buildSrc/src/main/java/co/anitrend/support/markdown/buildSrc/plugin/extensions/ProjectExtensions.kt @@ -2,8 +2,12 @@ package co.anitrend.support.markdown.buildSrc.plugin.extensions import com.android.build.gradle.* import org.gradle.api.Project +import org.gradle.api.artifacts.MinimalExternalModuleDependency +import org.gradle.api.artifacts.VersionCatalog +import org.gradle.api.artifacts.VersionCatalogsExtension +import org.gradle.api.artifacts.VersionConstraint import com.android.build.gradle.api.AndroidBasePlugin -import com.android.build.gradle.api.BaseVariantOutput +import com.android.build.gradle.BaseExtension import com.android.build.gradle.internal.dsl.BaseAppModuleExtension import org.gradle.api.internal.plugins.DefaultArtifactPublicationSet import org.gradle.api.plugins.ExtraPropertiesExtension @@ -11,10 +15,29 @@ import org.gradle.api.plugins.JavaPluginExtension import org.gradle.api.publish.PublishingExtension import org.gradle.api.reporting.ReportingExtension import org.gradle.api.tasks.SourceSetContainer +import com.diffplug.gradle.spotless.SpotlessExtension +import org.gradle.accessors.dm.LibrariesForLibs import org.gradle.kotlin.dsl.getByType import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension import org.jetbrains.kotlin.gradle.internal.AndroidExtensionsExtension import org.jetbrains.kotlin.gradle.testing.internal.KotlinTestsRegistry +import java.io.File +import java.util.Properties + +internal val Project.releaseProperties: Properties + get() { + val releaseFile = File(rootDir, "gradle/release.properties") + if (!releaseFile.exists()) { + logger.error("Release file cannot be found in path: $releaseFile") + } + + return Properties(2).apply { + load(releaseFile.inputStream()) + } + } + +internal val Project.libs: LibrariesForLibs + get() = extensions.getByType() internal fun Project.baseExtension() = extensions.getByType() @@ -43,9 +66,6 @@ internal fun Project.sourceSetContainer() = internal fun Project.javaPluginExtension() = extensions.getByType() -internal fun Project.variantOutput() = - extensions.getByType() - internal fun Project.kotlinAndroidProjectExtension() = extensions.getByType() @@ -58,6 +78,9 @@ internal fun Project.androidExtensionsExtension() = internal fun Project.publishingExtension() = extensions.getByType() +internal fun Project.spotlessExtension() = + extensions.getByType() + internal fun Project.containsAndroidPlugin(): Boolean { return project.plugins.toList().any { plugin -> plugin is AndroidBasePlugin diff --git a/buildSrc/src/main/java/co/anitrend/support/markdown/buildSrc/plugin/strategy/DependencyStrategy.kt b/buildSrc/src/main/java/co/anitrend/support/markdown/buildSrc/plugin/strategy/DependencyStrategy.kt index 72af157..6968ba8 100644 --- a/buildSrc/src/main/java/co/anitrend/support/markdown/buildSrc/plugin/strategy/DependencyStrategy.kt +++ b/buildSrc/src/main/java/co/anitrend/support/markdown/buildSrc/plugin/strategy/DependencyStrategy.kt @@ -1,48 +1,52 @@ package co.anitrend.support.markdown.buildSrc.plugin.strategy -import co.anitrend.support.markdown.buildSrc.Libraries +import co.anitrend.support.markdown.buildSrc.common.isSampleModule import co.anitrend.support.markdown.buildSrc.common.sample +import co.anitrend.support.markdown.buildSrc.plugin.extensions.libs +import co.anitrend.support.markdown.buildSrc.plugin.extensions.test +import co.anitrend.support.markdown.buildSrc.plugin.extensions.androidTest +import co.anitrend.support.markdown.buildSrc.plugin.extensions.implementation +import org.gradle.api.Project import org.gradle.api.artifacts.dsl.DependencyHandler -internal class DependencyStrategy( - private val module: String -) { +internal class DependencyStrategy(private val project: Project) { private fun DependencyHandler.applyDefaultDependencies() { - add("implementation", Libraries.JetBrains.Kotlin.stdlib) + implementation(project.libs.jetbrains.kotlin.stdlib.jdk8) + implementation(project.libs.jetbrains.kotlin.reflect) - if (module == sample) { - add("implementation", Libraries.Koin.AndroidX.fragment) - add("implementation", Libraries.Koin.AndroidX.viewmodel) - add("implementation", Libraries.Koin.AndroidX.scope) - add("implementation", Libraries.Koin.extension) - add("implementation", Libraries.Koin.core) + if (project.isSampleModule()) { + implementation(project.libs.koin.android) + implementation(project.libs.koin.core) } - // Testing libraries - add("testImplementation", Libraries.junit) - add("testImplementation", Libraries.mockk) + // Testing libs + test(project.libs.junit) + test(project.libs.mockk) } private fun DependencyHandler.applyTestDependencies() { - if (module == sample) - add("testImplementation", Libraries.Koin.test) - add("androidTestImplementation", Libraries.AndroidX.Test.core) - add("androidTestImplementation", Libraries.AndroidX.Test.runner) - add("androidTestImplementation", Libraries.AndroidX.Test.Espresso.core) + if (project.isSampleModule()) { + test(project.libs.koin.test) + test(project.libs.koin.test.junit4) + } + androidTest(project.libs.androidx.test.ext.junit.ktx) + androidTest(project.libs.androidx.test.core.ktx) + androidTest(project.libs.androidx.test.runner) + androidTest(project.libs.mockk.android) } private fun DependencyHandler.applyLifeCycleDependencies() { - add("implementation", Libraries.AndroidX.Lifecycle.liveDataCoreKtx) - add("implementation", Libraries.AndroidX.Lifecycle.viewModelKtx) - add("implementation", Libraries.AndroidX.Lifecycle.liveDataKtx) - add("implementation", Libraries.AndroidX.Lifecycle.runTimeKtx) - add("implementation", Libraries.AndroidX.Lifecycle.extensions) + implementation(project.libs.androidx.lifecycle.livedata.core.ktx) + implementation(project.libs.androidx.lifecycle.viewmodel.ktx) + implementation(project.libs.androidx.lifecycle.livedata.ktx) + implementation(project.libs.androidx.lifecycle.runtime.ktx) + implementation(project.libs.androidx.lifecycle.extensions) } fun applyDependenciesOn(handler: DependencyHandler) { handler.applyDefaultDependencies() handler.applyTestDependencies() - if (module == sample) + if (project.isSampleModule()) handler.applyLifeCycleDependencies() } } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 02e5d9e..7464a54 100644 --- a/gradle.properties +++ b/gradle.properties @@ -31,4 +31,8 @@ kapt.incremental.apt=true # Improved file system watcher # https://blog.gradle.org/introducing-file-system-watching -org.gradle.vfs.watch=true \ No newline at end of file +org.gradle.vfs.watch=true + +# For tracking root causes for obseleteApi in gradle build +# android.debug.obsoleteApi=true +android.disableAutomaticComponentCreation=true \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..0007740 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,125 @@ +[versions] +ktlint = "0.48.2" + +gradle-plugin = "7.4.1" + +androidx-activity = "1.6.1" +androidx-core = "1.9.0" +androidx-fragment = "1.5.5" +androidx-lifecycle = "2.5.1" +androidx-lifecycle-extensions = "2.2.0" +androidx-paging = "3.1.1" +androidx-recycler = "1.3.0-rc01" +androidx-test-ext = "1.1.5" + +coil = "2.2.2" + +google-android-material = "1.8.0" + +jetbrains-dokka = "1.7.20" +jetbrains-kotlin = "1.7.20" +jetbrains-kotlinx-coroutines = "1.6.4" +jetbrains-kotlinx-datetime = "0.4.0" +jetbrains-kotlinx-serialization = "1.5.0" + +koin = "3.1.6" +koin-android = "3.1.6" + +markwon = "4.6.2" + +mockk = "1.13.4" + + +[plugins] +gradle-versions = { id = "com.github.ben-manes.versions", version = "0.46.0" } + + +[libraries] +threeTenBp = { module = "com.jakewharton.threetenabp:threetenabp", version = "1.4.4" } +timber = { module = "com.jakewharton.timber:timber", version = "5.0.1" } +junit = { module = "junit:junit", version = "4.13.2" } + +jsoup = { module = "org.jsoup:jsoup", version = "1.15.4" } +scalingImageView = { module = "com.davemorrissey.labs:subsampling-scale-image-view-androidx", version = "3.10.0" } +retrofitSerializer = { module = "com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter", version = "0.8.0" } + +android-gradle-plugin = { module = "com.android.tools.build:gradle", version.ref = "gradle-plugin" } + +androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "androidx-activity" } + +androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx-core" } + +androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version = "2.1.4" } + +androidx-fragment-ktx = { module = "androidx.fragment:fragment-ktx", version.ref = "androidx-fragment" } +androidx-fragment-test = { module = "androidx.fragment:fragment-testing", version.ref = "androidx-fragment" } + +androidx-lifecycle-extensions = { module = "androidx.lifecycle:lifecycle-extensions", version.ref = "androidx-lifecycle-extensions" } +androidx-lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "androidx-lifecycle" } +androidx-lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "androidx-lifecycle" } +androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle" } +androidx-lifecycle-livedata-core-ktx = { module = "androidx.lifecycle:lifecycle-livedata-core-ktx", version.ref = "androidx-lifecycle" } + +androidx-paging-common = { module = "androidx.paging:paging-common-ktx", version.ref = "androidx-paging" } +androidx-paging-runtime = { module = "androidx.paging:paging-runtime", version.ref = "androidx-paging" } +androidx-paging-runtime-ktx = { module = "androidx.paging:paging-runtime-ktx", version.ref = "androidx-paging" } + +androidx-startup-runtime = { module = "androidx.startup:startup-runtime", version = "1.1.1" } + +androidx-swipeRefreshLayout = { module = "androidx.swiperefreshlayout:swiperefreshlayout", version = "1.2.0-alpha01" } + +androidx-recyclerView = { module = "androidx.recyclerview:recyclerview", version.ref = "androidx-recycler" } + +androidx-test-core-ktx = { module = "androidx.test:core-ktx", version = "1.5.0" } +androidx-test-runner = { module = "androidx.test:runner", version = "1.5.2" } +androidx-test-rules = { module = "androidx.test:rules", version = "1.5.0" } +androidx-test-ext-junit-ktx = { module = "androidx.test.ext:junit-ktx", version.ref = "androidx-test-ext" } + + +coil = { module = "io.coil-kt:coil", version.ref = "coil" } +coil-base = { module = "io.coil-kt:coil-base", version.ref = "coil" } +coil-gif = { module = "io.coil-kt:coil-gif", version.ref = "coil" } +coil-svg = { module = "io.coil-kt:coil-svg", version.ref = "coil" } +coil-video = { module = "io.coil-kt:coil-video", version.ref = "coil" } + +google-android-material = { module = "com.google.android.material:material", version.ref = "google-android-material" } + +jetbrains-annotations = { module = "org.jetbrains:annotations", version = "16.0.2" } +jetbrains-dokka-gradle = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "jetbrains-dokka" } +jetbrains-kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "jetbrains-kotlin" } +jetbrains-kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "jetbrains-kotlin" } +jetbrains-kotlin-gradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "jetbrains-kotlin" } +jetbrains-kotlin-extensions = { module = "org.jetbrains.kotlin:kotlin-android-extensions", version.ref = "jetbrains-kotlin" } +jetbrains-kotlin-serialization = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "jetbrains-kotlin" } + +jetbrains-kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "jetbrains-kotlinx-coroutines" } +jetbrains-kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "jetbrains-kotlinx-coroutines" } +jetbrains-kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "jetbrains-kotlinx-coroutines" } +jetbrains-kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "jetbrains-kotlinx-datetime" } +jetbrains-kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "jetbrains-kotlinx-serialization" } + +koin-core = { module = "io.insert-koin:koin-core", version.ref = "koin" } +koin-test = { module = "io.insert-koin:koin-test", version.ref = "koin" } +koin-test-junit4 = { module = "io.insert-koin:koin-test-junit4", version.ref = "koin" } +koin-android = { module = "io.insert-koin:koin-android", version.ref = "koin-android" } + +markwon-core = { module = "io.noties.markwon:core", version.ref = "markwon" } +markwon-editor = { module = "io.noties.markwon:editor", version.ref = "markwon" } +markwon-html = { module = "io.noties.markwon:html", version.ref = "markwon" } +markwon-image = { module = "io.noties.markwon:image", version.ref = "markwon" } +markwon-coil = { module = "io.noties.markwon:image-coil", version.ref = "markwon" } +markwon-parser = { module = "io.noties.markwon:inline-parser", version.ref = "markwon" } +markwon-linkify = { module = "io.noties.markwon:linkify", version.ref = "markwon" } +markwon-simple-ext = { module = "io.noties.markwon:simple-ext", version.ref = "markwon" } +markwon-syntax-highlight = { module = "io.noties.markwon:syntax-highlight", version.ref = "markwon" } +markwon-ext-tasklist = { module = "io.noties.markwon:ext-tasklist", version.ref = "markwon" } +markwon-ext-strikethrough = { module = "io.noties.markwon:ext-strikethrough", version.ref = "markwon" } +markwon-ext-tables = { module = "io.noties.markwon:ext-tables", version.ref = "markwon" } +markwon-ext-latex = { module = "io.noties.markwon:ext-latex", version.ref = "markwon" } + +mockk = { module = "io.mockk:mockk", version.ref = "mockk" } +mockk-android = { module = "io.mockk:mockk-android", version.ref = "mockk" } + +saket-betterlinkmovementmethod = { module = "me.saket:better-link-movement-method", version = "2.2.0" } + +spotless-gradle = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = "6.15.0" } diff --git a/gradle/release.properties b/gradle/release.properties new file mode 100644 index 0000000..035fc03 --- /dev/null +++ b/gradle/release.properties @@ -0,0 +1,2 @@ +version=0.12.1 +code=1200001 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c023ec8b20f512888fe07c5bd3ff77bb8f..7454180f2ae8848c63b8b4dea2cb829da983f2fa 100644 GIT binary patch delta 18435 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 B8dv}T delta 17845 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 X49Luk)baa85H9$5YCsTPT`SVRWMtMW diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 39361c5..2ec77e5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Thu Mar 18 22:07:40 SAST 2021 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip diff --git a/markdown/build.gradle.kts b/markdown/build.gradle.kts index 72f4efb..a30028f 100644 --- a/markdown/build.gradle.kts +++ b/markdown/build.gradle.kts @@ -1,43 +1,17 @@ -import co.anitrend.support.markdown.buildSrc.Libraries - plugins { id("co.anitrend.support.markdown") } -configurations { - fun excludeDefault(configuration: Configuration) { - configuration.exclude( - mapOf( - "group" to "org.jetbrains", - "module" to "annotations" - ) - ) - } - println("Configurations available [${configurations.joinToString()}]") - getByName("implementation") { - excludeDefault(this) - } - getByName("androidTestImplementation") { - excludeDefault(this) - } -} - dependencies { - implementation(Libraries.Markwon.core) - implementation(Libraries.Markwon.editor) - implementation(Libraries.Markwon.html) - implementation(Libraries.Markwon.coil) - implementation(Libraries.Markwon.parser) - implementation(Libraries.Markwon.linkify) - implementation(Libraries.Markwon.simpleExt) - implementation(Libraries.Markwon.syntaxHighlight) - implementation(Libraries.Markwon.Extension.taskList) - implementation(Libraries.Markwon.Extension.strikeThrough) - implementation(Libraries.Markwon.Extension.tables) - - implementation(Libraries.JetBrains.Markdown.markdown) - - testImplementation(Libraries.AndroidX.Test.coreKtx) - testImplementation(Libraries.AndroidX.Test.Extension.junit) - testImplementation(Libraries.AndroidX.Test.Extension.junitKtx) + implementation(libs.markwon.core) + implementation(libs.markwon.editor) + implementation(libs.markwon.html) + implementation(libs.markwon.coil) + implementation(libs.markwon.parser) + implementation(libs.markwon.linkify) + implementation(libs.markwon.simple.ext) + implementation(libs.markwon.syntax.highlight) + implementation(libs.markwon.ext.tasklist) + implementation(libs.markwon.ext.strikethrough) + implementation(libs.markwon.ext.tables) }