Skip to content

Commit

Permalink
Merge pull request #3 from Litres/fix_upload
Browse files Browse the repository at this point in the history
Fix upload
  • Loading branch information
Toxa2033 authored Jul 29, 2024
2 parents dee44d2 + 9100e13 commit d1aa2da
Show file tree
Hide file tree
Showing 44 changed files with 399 additions and 283 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pre-merge.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ jobs:
if: ${{ !contains(github.event.head_commit.message, 'ci skip') }}
steps:
- name: Checkout Repo
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Cache Gradle Caches
uses: gradle/gradle-build-action@v2
uses: gradle/actions/setup-gradle@v3
- name: Run Gradle tasks
run: ./gradlew preMerge --continue
4 changes: 2 additions & 2 deletions .github/workflows/publish-plugin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
if: ${{ !contains(github.event.head_commit.message, 'ci skip') }}
steps:
- name: Checkout Repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- id: get_version
uses: battila7/[email protected]
Expand All @@ -23,7 +23,7 @@ jobs:
run: echo "RELEASE_VERSION="${{ steps.get_version.outputs.version-without-v }} >> $GITHUB_ENV

- name: Cache Gradle Caches
uses: gradle/gradle-build-action@v2
uses: gradle/actions/setup-gradle@v3

- name: Run Gradle tasks
run: ./gradlew preMerge --continue
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@
/.idea/navEditor.xml
/.idea/assetWizardSettings.xml
build
/plugin-build/.kotlin/
.kotlin
1 change: 1 addition & 0 deletions .idea/.name

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 1 addition & 5 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 1 addition & 6 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ subprojects {
}

detekt {
config = rootProject.files("config/detekt/detekt.yml")
config.setFrom(rootProject.files("config/detekt/detekt.yml"))
}
}

Expand All @@ -48,7 +48,7 @@ tasks.withType<DependencyUpdatesTask> {
fun String.isNonStable() = "^[0-9,.v-]+(-r)?$".toRegex().matches(this).not()

tasks.register("clean", Delete::class.java) {
delete(rootProject.buildDir)
delete(rootProject.layout.buildDirectory)
}

tasks.register("reformatAll") {
Expand Down
Loading

0 comments on commit d1aa2da

Please sign in to comment.