diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..e973948 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,6 @@ +version: 2 +updates: + - package-ecosystem: "gradle" # See documentation for possible values + directory: "/" # Location of package manifests + schedule: + interval: "daily" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 82292db..f4e142e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,15 +1,42 @@ name: Build the app -on: [push] +on: + push: + branches: [ main ] + pull_request: + branches: [ main ] + +env: + ACRA_LOGIN: ${{ secrets.ACRARIUM_BASIC_AUTH_LOGIN }} + ACRA_PASS: ${{ secrets.ACRARIUM_BASIC_AUTH_PASSWORD }} + ACRA_URI: ${{ secrets.ACRARIUM_URI }} + BRANCH_NAME: ${{ github.ref_name }} jobs: - build: + check: + if: ${{ startsWith(github.actor, 'dependabot') }} + environment: Development runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + java-version: '17' + distribution: 'adopt' + cache: gradle + + - name: Validate Gradle wrapper + uses: gradle/wrapper-validation-action@v1.0.5 + + - name: Build debug APK + run: ./gradlew assembleDebug + + build: + if: ${{ ! startsWith(github.actor, 'dependabot') }} environment: Development - env: - ACRA_LOGIN: ${{ secrets.ACRARIUM_BASIC_AUTH_LOGIN }} - ACRA_PASS: ${{ secrets.ACRARIUM_BASIC_AUTH_PASSWORD }} - ACRA_URI: ${{ secrets.ACRARIUM_URI }} + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -28,13 +55,13 @@ jobs: echo "${{ secrets.KEYSTORE_ENCRYPTED }}" > keystore.asc gpg -d --passphrase "${{ secrets.KEYSTORE_PASSWORD }}" --batch keystore.asc > keystore.jks - - name: Build Release APK + - name: Build release APK run: ./gradlew assembleRelease - - name: Upload Release APK + - name: Upload release APK uses: actions/upload-artifact@v3 with: - name: ark-retouch-release + name: ark-retouch path: ./app/build/outputs/apk/release/*.apk lint: diff --git a/app/build.gradle b/app/build.gradle index 46b434e..e74aa68 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -60,11 +60,11 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = '1.8' + jvmTarget = '17' } buildFeatures { compose true @@ -128,4 +128,3 @@ task installGitHook(type: Copy) { tasks.preBuild.dependsOn installGitHook tasks.preBuild.dependsOn ktlintCheck -