From 17bec86f4ce9fdf181c5a945e71dac6f79b382c9 Mon Sep 17 00:00:00 2001 From: frknkrc44 Date: Thu, 11 Sep 2025 23:09:09 +0300 Subject: [PATCH] Optimize imports, try to add GitHub release support This is not a code change release, so you can continue to use the previous version. --- .github/workflows/main.yml | 27 ++++++++++++++----- .../hma_oss/ui/adapter/AppPresetAdapter.kt | 1 - .../hma_oss/ui/fragment/AppPresetFragment.kt | 5 ---- .../ui/fragment/PresetManageFragment.kt | 2 -- 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6cfecb5..b2d232c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,6 +16,8 @@ jobs: build: name: Build on ${{ matrix.os }} runs-on: ${{ matrix.os }} + permissions: + contents: write strategy: fail-fast: false matrix: @@ -66,8 +68,11 @@ jobs: id: buildAll run: | ./gradlew assemble - echo "releaseName=$(ls app/build/outputs/apk/release/*.apk | awk -F '(/|.apk)' '{print $5}')" >> $GITHUB_OUTPUT - echo "debugName=$(ls app/build/outputs/apk/debug/*.apk | awk -F '(/|.apk)' '{print $5}')" >> $GITHUB_OUTPUT + echo "releaseName=$(ls app/build/outputs/apk/release/*.apk | awk -F '(/|.apk)' '{print $6}')" >> $GITHUB_OUTPUT + echo "debugName=$(ls app/build/outputs/apk/debug/*.apk | awk -F '(/|.apk)' '{print $6}')" >> $GITHUB_OUTPUT + echo "releaseFile=$(ls app/build/outputs/apk/release/*.apk)" >> $GITHUB_OUTPUT + echo "debugFile=$(ls app/build/outputs/apk/debug/*.apk)" >> $GITHUB_OUTPUT + echo "ossNum=$(ls app/build/outputs/apk/debug/*.apk | awk -F '(/|.apk)' '{print $6}' | cut -f4 -d'-')" >> $GITHUB_OUTPUT - name: Upload release if: success() @@ -89,6 +94,17 @@ jobs: name: mappings path: "app/build/outputs/mapping/release" + - name: Upload to GitHub release + uses: softprops/action-gh-release@v2 + with: + token: ${{ secrets.GITHUB_TOKEN }} + name: oss-${{ steps.buildAll.outputs.ossNum }} + body: ${{ github.event.head_commit.message }} + files: | + ${{ steps.buildAll.outputs.releaseFile }} + ${{ steps.buildAll.outputs.debugFile }} + tag_name: oss-${{ steps.buildAll.outputs.ossNum }} + - name: Post to channel if: ${{ github.event_name != 'pull_request' && success() && github.ref == 'refs/heads/master' }} env: @@ -97,8 +113,7 @@ jobs: COMMIT_URL: ${{ github.event.head_commit.url }} COMMIT_MESSAGE: ${{ github.event.head_commit.message }} run: | - OUTPUT="app/build/outputs/apk/" - export release=$(find $OUTPUT -name "*-release.apk") - export debug=$(find $OUTPUT -name "*-debug.apk") + export release=${{ steps.buildAll.outputs.releaseFile }} + export debug=${{ steps.buildAll.outputs.debugFile }} ESCAPED=`python3 -c 'import json,os,urllib.parse; msg = json.dumps(os.environ["COMMIT_MESSAGE"]); print(urllib.parse.quote(msg if len(msg) <= 1024 else json.dumps(os.environ["COMMIT_URL"])))'` - curl -v "https://api.telegram.org/bot${BOT_TOKEN}/sendMediaGroup?chat_id=${CHANNEL_ID}&media=%5B%7B%22type%22:%22document%22,%20%22media%22:%22attach://release%22%7D,%7B%22type%22:%22document%22,%20%22media%22:%22attach://debug%22,%22caption%22:${ESCAPED}%7D%5D" -F release="@$release" -F debug="@$debug" \ No newline at end of file + curl -v "https://api.telegram.org/bot${BOT_TOKEN}/sendMediaGroup?chat_id=${CHANNEL_ID}&media=%5B%7B%22type%22:%22document%22,%20%22media%22:%22attach://release%22%7D,%7B%22type%22:%22document%22,%20%22media%22:%22attach://debug%22,%22caption%22:${ESCAPED}%7D%5D" -F release="@$release" -F debug="@$debug" diff --git a/app/src/main/java/org/frknkrc44/hma_oss/ui/adapter/AppPresetAdapter.kt b/app/src/main/java/org/frknkrc44/hma_oss/ui/adapter/AppPresetAdapter.kt index 985c61c..2d49326 100644 --- a/app/src/main/java/org/frknkrc44/hma_oss/ui/adapter/AppPresetAdapter.kt +++ b/app/src/main/java/org/frknkrc44/hma_oss/ui/adapter/AppPresetAdapter.kt @@ -7,7 +7,6 @@ import icu.nullptr.hidemyapplist.ui.adapter.AppSelectAdapter import icu.nullptr.hidemyapplist.ui.view.AppItemView import icu.nullptr.hidemyapplist.util.PackageHelper import kotlinx.coroutines.runBlocking -import kotlin.lazy class AppPresetAdapter( private val presetName: String diff --git a/app/src/main/java/org/frknkrc44/hma_oss/ui/fragment/AppPresetFragment.kt b/app/src/main/java/org/frknkrc44/hma_oss/ui/fragment/AppPresetFragment.kt index d97e261..3ada7a2 100644 --- a/app/src/main/java/org/frknkrc44/hma_oss/ui/fragment/AppPresetFragment.kt +++ b/app/src/main/java/org/frknkrc44/hma_oss/ui/fragment/AppPresetFragment.kt @@ -9,13 +9,8 @@ import icu.nullptr.hidemyapplist.service.PrefManager import icu.nullptr.hidemyapplist.ui.fragment.AppSelectFragment import icu.nullptr.hidemyapplist.util.PackageHelper import icu.nullptr.hidemyapplist.util.PackageHelper.Comparators -import kotlinx.coroutines.CoroutineStart -import kotlinx.coroutines.async -import kotlinx.coroutines.coroutineScope -import kotlinx.coroutines.delay import kotlinx.coroutines.launch import org.frknkrc44.hma_oss.ui.adapter.AppPresetAdapter -import kotlin.coroutines.suspendCoroutine class AppPresetFragment() : AppSelectFragment() { diff --git a/app/src/main/java/org/frknkrc44/hma_oss/ui/fragment/PresetManageFragment.kt b/app/src/main/java/org/frknkrc44/hma_oss/ui/fragment/PresetManageFragment.kt index 2607c28..6849c61 100644 --- a/app/src/main/java/org/frknkrc44/hma_oss/ui/fragment/PresetManageFragment.kt +++ b/app/src/main/java/org/frknkrc44/hma_oss/ui/fragment/PresetManageFragment.kt @@ -6,13 +6,11 @@ import android.view.View import android.view.WindowInsets import androidx.core.view.doOnPreDraw import androidx.fragment.app.Fragment -import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.LinearLayoutManager import by.kirich1409.viewbindingdelegate.viewBinding import icu.nullptr.hidemyapplist.service.ConfigManager import icu.nullptr.hidemyapplist.ui.util.navController import icu.nullptr.hidemyapplist.ui.util.setupToolbar -import kotlinx.coroutines.launch import org.frknkrc44.hma_oss.R import org.frknkrc44.hma_oss.databinding.FragmentPresetManageBinding import org.frknkrc44.hma_oss.ui.adapter.AppPresetListAdapter