Skip to content
This repository has been archived by the owner on Jul 16, 2024. It is now read-only.

Commit

Permalink
Merge branch 'refs/heads/trunk' into compose-migration
Browse files Browse the repository at this point in the history
  • Loading branch information
Goooler committed Jul 3, 2024
2 parents 8546123 + 7bf3904 commit 8d10b1c
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 28 deletions.
17 changes: 17 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ on:
push:
branches:
- trunk
tags:
- '**'
paths-ignore:
- '.idea/**'
- '.gitattributes'
Expand Down Expand Up @@ -159,3 +161,18 @@ jobs:
with:
name: build-outputs
path: app/build/outputs/apk/prod/release/*.apk

release:
runs-on: ubuntu-latest
if: github.repository_owner == 'Goooler' && startsWith(github.ref, 'refs/tags/')
needs: build
permissions:
contents: write
steps:
- uses: actions/checkout@v4
- uses: actions/download-artifact@v4
- name: Release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
gh release create ${{ github.ref_name }} **/*.apk --generate-notes
23 changes: 0 additions & 23 deletions .github/workflows/release.yml

This file was deleted.

10 changes: 5 additions & 5 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[versions]
versionName = "1.9.0"
versionCode = "109000"
versionName = "2.0.0"
versionCode = "200000"
agp = "8.5.0"
androidX-activity = "1.9.0"
androidX-lifecycle = "2.8.2"
androidX-lifecycle = "2.8.3"
androidX-room = "2.6.1"
chucker = "4.0.0"
coil = "2.6.0"
Expand Down Expand Up @@ -92,8 +92,8 @@ srl-footer = { module = "io.github.scwang90:refresh-footer-classics", version.re
srl-header = { module = "io.github.scwang90:refresh-header-classics", version.ref = "srl" }
srl-kernel = { module = "io.github.scwang90:refresh-layout-kernel", version.ref = "srl" }
utils = "com.blankj:utilcodex:1.31.1"
ktlint = "com.pinterest.ktlint:ktlint-cli:1.3.0"
composeRules = "io.nlopez.compose.rules:detekt:0.4.4"
ktlint = "com.pinterest.ktlint:ktlint-cli:1.3.1"
composeRules = "io.nlopez.compose.rules:detekt:0.4.5"

[bundles]
androidX-compose = [
Expand Down

0 comments on commit 8d10b1c

Please sign in to comment.