Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@ jobs:
echo "DC_RELEASE_KEY_ALIAS_FDROID=${{ secrets.ALIAS_FDROID }}" >> ~/.gradle/gradle.properties
echo "DC_RELEASE_KEY_ALIAS_GPLAY=${{ secrets.ALIAS_GPLAY }}" >> ~/.gradle/gradle.properties
echo "DC_RELEASE_KEY_PASSWORD=${{ secrets.KEYSTORE_PASSWORD }}" >> ~/.gradle/gradle.properties
./gradlew assembleFossRelease
rm build/outputs/apk/foss/release/*universal*
mkdir dist
for abi in armeabi-v7a arm64-v8a x86 x86_64; do ./gradlew -PABI_FILTER=$abi assembleFossRelease; mv build/outputs/apk/foss/release/*.apk dist/; done
mv build/outputs/mapping/fossRelease/mapping.txt dist/mapping-foss.txt
./gradlew assembleGplayRelease
mv build/outputs/apk/gplay/release/*universal* build/outputs/apk/foss/release/ArcaneChat-gplay.apk
mv build/outputs/mapping/fossRelease/mapping.txt build/outputs/mapping/fossRelease/mapping-foss.txt
mv build/outputs/mapping/gplayRelease/mapping.txt build/outputs/mapping/fossRelease/mapping-gplay.txt
mv build/outputs/apk/gplay/release/*universal* dist/ArcaneChat-gplay.apk
mv build/outputs/mapping/gplayRelease/mapping.txt dist/mapping-gplay.txt

- name: Release on GitHub
uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda # v3.0.0
Expand All @@ -70,5 +70,4 @@ jobs:
prerelease: ${{ contains(github.event.ref, '-beta') }}
fail_on_unmatched_files: true
files: |
build/outputs/apk/foss/release/*.apk
build/outputs/mapping/fossRelease/mapping-*.txt
dist/*
15 changes: 8 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -184,25 +184,26 @@ android {
androidComponents {
onVariants(selector().all()) { variant ->
variant.outputs.each { output ->
output.outputFileName.set(
output.outputFileName.get()
.replace("android", "ArcaneChat")
.replace("-release", "")
.replace(".apk", "-${output.versionName.get()}.apk")
)

def apkSuffix = "-${output.versionName.get()}.apk"
def vCode = output.versionCode.get()
def abiFilter = output.filters.find {
it.filterType == com.android.build.api.variant.FilterConfiguration.FilterType.ABI
}
def abiName = abiFilter ? abiFilter.identifier : null
if(project.hasProperty("ABI_FILTER")) {
output.versionCode.set(vCode * 10 + project.ext.versionCodes.get(ABI_FILTER))
apkSuffix = "-${ABI_FILTER}" + apkSuffix
} else if (abiName != null && project.ext.versionCodes.containsKey(abiName)) {
output.versionCode.set(vCode * 10 + project.ext.versionCodes.get(abiName))
} else {
output.versionCode.set(vCode * 10 + 4)
}
output.outputFileName.set(
output.outputFileName.get()
.replace("android", "ArcaneChat")
.replace("-release", "")
.replace(".apk", apkSuffix)
)
}
}
}
Expand Down
4 changes: 4 additions & 0 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ fetch:
clean:
./gradlew --offline clean

.PHONY: fmt
fmt:
./gradlew spotlessApply


# CORE:

Expand Down