diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 2c6b3864..b9010392 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -23,7 +23,9 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Build JAR dist files - run: ./gradlew dist + env: + WORKFLOW_RUN: ${{ github.run_number }} + run: ./gradlew dist -PSNAPSHOT=true - name: Build deb package env: WORKFLOW_RUN: ${{ github.run_number }} @@ -55,7 +57,9 @@ jobs: with: java-version: 16 - name: Build JAR dist files - run: ./gradlew.bat dist + env: + WORKFLOW_RUN: ${{ github.run_number }} + run: ./gradlew.bat dist -PSNAPSHOT=true - name: Build msi package env: WORKFLOW_RUN: ${{ github.run_number }} @@ -83,7 +87,9 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Build JAR dist files - run: ./gradlew dist + env: + WORKFLOW_RUN: ${{ github.run_number }} + run: ./gradlew dist -PSNAPSHOT=true - name: Build dmg package env: WORKFLOW_RUN: ${{ github.run_number }} diff --git a/assets/plugins/plugin-9patch-0.1.0.jar b/assets/plugins/plugin-9patch-0.1.0.jar index 42476fe6..00e0ab64 100644 Binary files a/assets/plugins/plugin-9patch-0.1.0.jar and b/assets/plugins/plugin-9patch-0.1.0.jar differ diff --git a/assets/plugins/plugin-performance-0.1.0.jar b/assets/plugins/plugin-performance-0.1.0.jar index c680db07..0b70e85a 100644 Binary files a/assets/plugins/plugin-performance-0.1.0.jar and b/assets/plugins/plugin-performance-0.1.0.jar differ diff --git a/assets/plugins/plugin-skin-composer-0.1.0.jar b/assets/plugins/plugin-skin-composer-0.1.0.jar index 9568b108..5ef5c7e6 100644 Binary files a/assets/plugins/plugin-skin-composer-0.1.0.jar and b/assets/plugins/plugin-skin-composer-0.1.0.jar differ diff --git a/assets/plugins/plugin-tiled-0.1.0.jar b/assets/plugins/plugin-tiled-0.1.0.jar index a2c0e66c..20d98a96 100644 Binary files a/assets/plugins/plugin-tiled-0.1.0.jar and b/assets/plugins/plugin-tiled-0.1.0.jar differ diff --git a/build.gradle b/build.gradle index 40a438ed..b519fa3f 100644 --- a/build.gradle +++ b/build.gradle @@ -52,6 +52,17 @@ mainClassName = "games.rednblack.editor.Main" project.ext.assetsDir = new File("assets/"); def osName = System.getProperty('os.name').toLowerCase(Locale.ROOT) +def getBuildVersion = { + if (osName.contains('mac')) { + return getVersion().toString().replaceAll("0\\.", "") + } + if (project.hasProperty('SNAPSHOT')) { + return getVersion() + (project.hasProperty('WORKFLOW_RUN') ? WORKFLOW_RUN : "$System.env.WORKFLOW_RUN") + } else { + return getVersion() + } +} + task runHyperLap2D(dependsOn: classes, type: JavaExec) { mainClass = project.mainClassName classpath = sourceSets.main.runtimeClasspath @@ -61,6 +72,8 @@ task runHyperLap2D(dependsOn: classes, type: JavaExec) { } task dist(type: Jar) { + archiveVersion.set(getBuildVersion()) + duplicatesStrategy = DuplicatesStrategy.INCLUDE from files(sourceSets.main.output.classesDirs) from files(sourceSets.main.output.resourcesDir) @@ -121,17 +134,6 @@ dependencies { testImplementation group: 'junit', name: 'junit', version: '4.12' } -def getBuildVersion = { - if (osName.contains('mac')) { - return getVersion().toString().replaceAll("0\\.", "") - } - if (project.hasProperty('SNAPSHOT')) { - return getVersion() + (project.hasProperty('WORKFLOW_RUN') ? WORKFLOW_RUN : "$System.env.WORKFLOW_RUN") - } else { - return getVersion() - } -} - task deleteInstallerTemp(type: Delete) { delete "$buildDir/installer" }