Skip to content

Commit

Permalink
feat: upload initial changes
Browse files Browse the repository at this point in the history
  • Loading branch information
phinner committed Feb 10, 2024
1 parent 0a7fc35 commit 401713e
Show file tree
Hide file tree
Showing 169 changed files with 1,465 additions and 10,607 deletions.
4 changes: 4 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[*.{kt,kts}]
ktlint_code_style = ktlint_official
ktlint_standard_filename = disabled
ij_kotlin_packages_to_use_import_on_demand = unset
66 changes: 33 additions & 33 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,22 +36,22 @@ jobs:
- name: Build Artifact
run: ./gradlew build

- name: Set up Artifact Upload
run: |
echo "CORE_ARTIFACT_PATH=$(./gradlew :distributor-core:getArtifactPath -q)" >> $GITHUB_ENV
echo "KOTLIN_ARTIFACT_PATH=$(./gradlew :distributor-kotlin:getArtifactPath -q)" >> $GITHUB_ENV
- name: Upload Artifact to Actions (Core)
uses: actions/upload-artifact@v3
with:
name: ${{ github.event.repository.name }}
path: ${{ env.CORE_ARTIFACT_PATH }}

- name: Upload Artifact to Actions (Kotlin)
uses: actions/upload-artifact@v3
with:
name: ${{ github.event.repository.name }}
path: ${{ env.KOTLIN_ARTIFACT_PATH }}
# - name: Set up Artifact Upload
# run: |
# echo "CORE_ARTIFACT_PATH=$(./gradlew :distributor-core:getArtifactPath -q)" >> $GITHUB_ENV
# echo "KOTLIN_ARTIFACT_PATH=$(./gradlew :distributor-kotlin:getArtifactPath -q)" >> $GITHUB_ENV

# - name: Upload Artifact to Actions (Core)
# uses: actions/upload-artifact@v3
# with:
# name: ${{ github.event.repository.name }}
# path: ${{ env.CORE_ARTIFACT_PATH }}

# - name: Upload Artifact to Actions (Kotlin)
# uses: actions/upload-artifact@v3
# with:
# name: ${{ github.event.repository.name }}
# path: ${{ env.KOTLIN_ARTIFACT_PATH }}

- name: Determine Status
run: |
Expand All @@ -70,23 +70,23 @@ jobs:
ORG_GRADLE_PROJECT_signingKey: "${{ secrets.XPDUSTRY_MAVEN_SIGNING_KEY }}"
ORG_GRADLE_PROJECT_signingPassword: "${{ secrets.XPDUSTRY_MAVEN_SIGNING_PASSWORD }}"

- name: Upload Artifact to Release (Core)
if: ${{ env.STATUS == 'release' && github.event_name == 'release' }}
uses: svenstaro/upload-release-action@v2
with:
asset_name: distributor-core.jar
repo_token: ${{ secrets.GITHUB_TOKEN }}
file: ${{ env.CORE_ARTIFACT_PATH }}
tag: ${{ github.ref }}

- name: Upload Artifact to Release (Kotlin)
if: ${{ env.STATUS == 'release' && github.event_name == 'release' }}
uses: svenstaro/upload-release-action@v2
with:
asset_name: distributor-kotlin.jar
repo_token: ${{ secrets.GITHUB_TOKEN }}
file: ${{ env.KOTLIN_ARTIFACT_PATH }}
tag: ${{ github.ref }}
# - name: Upload Artifact to Release (Core)
# if: ${{ env.STATUS == 'release' && github.event_name == 'release' }}
# uses: svenstaro/upload-release-action@v2
# with:
# asset_name: distributor-core.jar
# repo_token: ${{ secrets.GITHUB_TOKEN }}
# file: ${{ env.CORE_ARTIFACT_PATH }}
# tag: ${{ github.ref }}

# - name: Upload Artifact to Release (Kotlin)
# if: ${{ env.STATUS == 'release' && github.event_name == 'release' }}
# uses: svenstaro/upload-release-action@v2
# with:
# asset_name: distributor-kotlin.jar
# repo_token: ${{ secrets.GITHUB_TOKEN }}
# file: ${{ env.KOTLIN_ARTIFACT_PATH }}
# tag: ${{ github.ref }}

- name: Update Changelog
if: ${{ env.STATUS == 'release' && github.event_name == 'release' }}
Expand Down
3 changes: 0 additions & 3 deletions .spotless/distributor.importorder

This file was deleted.

2 changes: 1 addition & 1 deletion LICENSE_HEADER.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Distributor, a feature-rich framework for Mindustry plugins.

Copyright (C) 2023 Xpdustry
Copyright (C) 2024 Xpdustry

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
15 changes: 12 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
plugins {
id("distributor.parent-conventions")
id("distributor4.parent-conventions")
}

version = "3.3.1" + if (indraGit.headTag() == null) "-SNAPSHOT" else ""
group = "fr.xpdustry"
version = "4.0.0" + if (indraGit.headTag() == null) "-SNAPSHOT" else ""
group = "com.xpdustry"
description = "The Mindustry plugin of ur dreams..."

tasks {
spotlessCheck {
dependsOn(gradle.includedBuild("distributor-build-logic").task(":spotlessCheck"))
}
spotlessApply {
dependsOn(gradle.includedBuild("distributor-build-logic").task(":spotlessApply"))
}
}
22 changes: 0 additions & 22 deletions buildSrc/build.gradle.kts

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

3 changes: 0 additions & 3 deletions buildSrc/src/main/kotlin/extensions.kt

This file was deleted.

24 changes: 0 additions & 24 deletions distributor-api/build.gradle.kts

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 401713e

Please sign in to comment.