From 89356590d380607b94631243cfdebc5de18615cf Mon Sep 17 00:00:00 2001 From: fgnm Date: Sun, 23 Jan 2022 19:28:48 +0100 Subject: [PATCH] [editor only] Fix double jar in snapshot builds --- .github/workflows/snapshot.yml | 12 ++++++--- assets/plugins/plugin-9patch-0.1.0.jar | Bin 22812 -> 22812 bytes assets/plugins/plugin-performance-0.1.0.jar | Bin 5898 -> 5898 bytes assets/plugins/plugin-skin-composer-0.1.0.jar | Bin 9943 -> 9943 bytes assets/plugins/plugin-tiled-0.1.0.jar | Bin 102997 -> 102997 bytes build.gradle | 24 ++++++++++-------- 6 files changed, 22 insertions(+), 14 deletions(-) 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 42476fe6ecc94f66c3c91366cca44ec6f3acbf1f..00e0ab6404e67e3164086430bf845dd15e8e40aa 100644 GIT binary patch delta 346 zcmbQUiE+**M!o=VW)?061`ZB}b*bhd6ZuqGz_ht1gl^3c~Pb zbOAFqPiM4dgs`qLiLyah?>UTkAuLs~!|V{&8`+&q5Y|eCTqsLQnFFdrO>-ZV^+NwV zA4J`5yQNTdDUJbxV6n+Nf}jq0A7lp+F$^|;YkzgakntT_NQV u25V?Kgi#Qh3}IXkO@uIP!k{9HVGOSDREShDjBzJC2_oVY0ad&*q8I>YVR}vg delta 346 zcmbQUiE+**M!o=VW)?061`ZB}<2z;rPvlc&X>Vf>o@nmL0_L|ULFiRF5c-xen4T=i zXa!;TGrE8oo2N5cGeTI`m_*qitoIy7ybzYE*kN`E>y7MACJ1Y#LN1ggrOW}GA>|MTYiK%zQ4pF8VO$SQgfMKvpdyQ546g80h*U9*aVI(b*3@MdP=VqoClU|5%G9x{(b*3@MdP=VqoClU^u>GR`5hVRhITP_TY);o-AN~ixPxhr30aF8H4G`f{a!W zhCibln6Y^#V<0nx^^PT*6~c<;s^NqvyDMxAHh8j#h#f>EOvC`f=n{b%bwb1uBEl=` Y0bxXnhCmn_MYACc1+gLsW13hA0C_J=RsaA1 diff --git a/assets/plugins/plugin-skin-composer-0.1.0.jar b/assets/plugins/plugin-skin-composer-0.1.0.jar index 9568b1083bb4482d45c2b53e31d6fe38c5878158..5ef5c7e69f4c7aebdf374baefc4da278e787f2ef 100644 GIT binary patch delta 230 zcmccad)=2Wz?+$ci-CcIgJE5&dB{XQRTeO9?g^n=lpypf9SD8P7)(zVWVC`X{2ATB zjLowcd-x$NEkR~h2+L5cg9*agE8zqcW0pI}0v4NmLJ4Zve#tsDTMnoWKH delta 230 zcmccad)=2Wz?+$ci-CcIgW<%ES-}(eR9V{F*n=mUd$Jq{@mrK2^eP<)eaje3PZngf zVgYHG?9b>9W^A6t*uxK&+pHzX%nD%{ighqSSbHU$pkmB&2U#FmPbe9KEt~vb$qr(w yqp|^nQL1bOVQf}*gfM<6dq8x#sDwfob5-&oQUa3eU6vyu|^JbYL+)=p7t6H8}0t?6E!w%X=Z z9zIy2KC}eQM4s@$me436Xb?*XsjU$cksuQ8{l80MzTDsa-~T!HoO55MyVcU&YH?)E zHJKwBv)S0WytHOVf|)Nl&1rK?XZf}w4olluEKgI#qB?1^iJR0+N{{0EoI^L0YP}}L zhTGI}&QaQDFAWO4rg9TZ+3jvE%TJ1WT&^cvcAAn-}LV)iPhYh8r?-E1#?3iFE z@lHEMiGpTyx#ykl!&rhvb=t;-wz+N_hDrStf_m}~X&-O;(hMO0! zV>I02Rhm zMyFrDoiNgAzrLH$GUGq~Jot@Qlfz@QHH~B)Vq*V&UOAD~zX~35-%EwD?0+`xRU-}3 zrx3kG<$AoCQgNf68%04wd+($ayC_E=GMJh%OuZwHE}&*TKapGpm5ib!yp-NHkuvb` zdU!H@@Q7IL#a>Fq2d?!mq^V+X+Tub=1_TTFcP*68LYfY6cxev8mU(GDl+#|yhccyx zVzm?>O~P)6kG24w`Dg=RdJ(MwoGPL`fWuEa0Rg|v@yRdE3yP)ZQZX%tC%Qy>0wppk zTtb^rLhe3V0=Te`wgW~6r~q&%AfwEsv}x)SiLk4ZQy@R;;xeoQW3W+tU681kZEK|r72obnifq|DA_{fQkJRhWo20jEzUUFxX$FbjB<@@ z{b;oxSyVE}mHN>JC0P`iRJ2eOS|-sTLPbzB?>PnCKj*pc_nz}D_i+2#w0&(_W5!CA zI+!uNo{gM~YBolzT~6Ja=6Nerf!C@?EEi{Dd6^hkBoi&bnnuZE{O?(<_hM_UD#oVh zrCFvp`Ky&Cc;8c{3Z~5VBss%Q8tIH?bU^T4)vOr>(CEJr;Cs*suC$EK=E_&&9Iix} z41^p@dXiRM8^u_(Rx;^lc?-=CxM6;XhUZBRTaLr(!>kazy71!~D5odi1xWePXv*6W z9b-V`ReYThP_Q_UTkbDe2Em;ASRVk%)}JI7RnS;zdKxd^lGYUr%gA~IFIJV?tA_G& zQ>e}y7|4r*lLsH@7#lJ(mM-~LS-h5=Lppe3_Zv9OJDkgNw^SN5*cH?>&=+E0EFqk+ zME|ZB>D1z2d3FtHy#uZYUa?+U8iu+u+n3_JlkFCs{P~rkASm~`?qD>MfAZ3;8)k^l zZaB4ojdwP~Cf)2=3BmZV!vwhfx|Ad5ed1lT_@#>y;Jk{8iNJ_r29Hmif;nzw^)pWg*c=RIWs+DG?c! zyfNhF+9wkwUU=A(VHNvH_h(X&+#k zgNgvH4zWvJPHUlTC>Kh1IcTCl z=tDJa2Bg-APBD_ZHDV;cYeeR~PSNF4C+)@#zY!NpZgGjCez?T(+mBHWJU5TgK|oS1 z6$097#Uw)AVwc@5TKVawz3}X=6W^h)PGnE6r#ysC*9&t*ga6kQxC`eSgfg{Jz}ZGR cgwS{o9RW0ZM99=6M$*tk+XEqGxQVvWAD4O*^8f$< 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" }