Merge branch 'main' into tasks

Author: abaker

.github/workflows/build-kdoc.yml

@@ -1,29 +1,39 @@
-name: Build KDoc
+name: Build and publish KDoc
 on:
   push:
     branches: [main]
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
 jobs:
   build:
-    name: Build and publish KDoc
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
-          submodules: true
-      - uses: actions/setup-java@v2
-        with:
-          distribution: 'temurin'
-          java-version: 11
-          cache: 'gradle'
-      - uses: gradle/wrapper-validation-action@v1
+          distribution: temurin
+          java-version: 17
+      - uses: gradle/actions/setup-gradle@v4
 
       - name: Build KDoc
-        run: ./gradlew dokkaHtml
-      - name: Publish KDoc
-        if: success()
-        uses: crazy-max/ghaction-github-pages@v2.5.0
+        run: ./gradlew --no-configuration-cache dokkaHtml
+
+      - uses: actions/upload-pages-artifact@v3
         with:
-          target_branch: gh-pages
-          build_dir: build/dokka/html
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          path: lib/build/dokka/html
+
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

.github/workflows/codeql.yml

@@ -0,0 +1,55 @@
+name: Dependent Issues
+
+on:
+  issues:
+    types:
+      - opened
+      - edited
+      - closed
+      - reopened
+  pull_request_target:
+    types:
+      - opened
+      - edited
+      - closed
+      - reopened
+      # Makes sure we always add status check for PRs. Useful only if
+      # this action is required to pass before merging. Otherwise, it
+      # can be removed.
+      - synchronize
+
+  # Schedule a daily check. Useful if you reference cross-repository
+  # issues or pull requests. Otherwise, it can be removed.
+  schedule:
+    - cron: '12 9 * * *'
+
+permissions: write-all
+
+jobs:
+  check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: z0al/dependent-issues@v1
+        env:
+          # (Required) The token to use to make API calls to GitHub.
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          # (Optional) The token to use to make API calls to GitHub for remote repos.
+          GITHUB_READ_TOKEN: ${{ secrets.DEPENDENT_ISSUES_READ_TOKEN }}
+
+        with:
+          # (Optional) The label to use to mark dependent issues
+          # label: dependent
+
+          # (Optional) Enable checking for dependencies in issues.
+          # Enable by setting the value to "on". Default "off"
+          check_issues: on
+
+          # (Optional) A comma-separated list of keywords. Default
+          # "depends on, blocked by"
+          keywords: depends on, blocked by
+
+          # (Optional) A custom comment body. It supports `{{ dependencies }}` token.
+          comment: >
+            This PR/issue depends on:
+
+            {{ dependencies }}

.github/workflows/dependent-issues.yml

@@ -1,68 +1,104 @@
 name: Development tests
 on: push
 jobs:
+  compile:
+    name: Compile and cache
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 21
+
+      # See https://community.gradle.org/github-actions/docs/setup-gradle/ for more information
+      - uses: gradle/actions/setup-gradle@v4            # creates build cache when on main branch
+        with:
+          cache-encryption-key: ${{ secrets.gradle_encryption_key }}
+          gradle-home-cache-cleanup: true               # clean up unused files
+          dependency-graph: generate-and-submit         # submit Github Dependency Graph info
+
+      - run: ./gradlew --build-cache --configuration-cache compileDebugSources
+
   test:
+    needs: compile
     name: Tests without emulator
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
-          submodules: true
-      - uses: actions/setup-java@v2
+          distribution: temurin
+          java-version: 21
+      - uses: gradle/actions/setup-gradle@v4
         with:
-          distribution: 'temurin'
-          java-version: 11
-          cache: 'gradle'
-      - uses: gradle/wrapper-validation-action@v1
+          cache-encryption-key: ${{ secrets.gradle_encryption_key }}
+          cache-read-only: true
 
-      - name: Check
-        run: ./gradlew check
-      - name: Archive results
-        uses: actions/upload-artifact@v2
-        with:
-          name: test-results
-          path: |
-            build/outputs/lint*
-            build/reports
+      - name: Run lint and unit tests
+        run: ./gradlew --build-cache --configuration-cache lintDebug testDebugUnitTest
 
   test_on_emulator:
+    needs: compile
     name: Tests with emulator
-    runs-on: privileged
-    container:
-      image: ghcr.io/bitfireat/docker-android-ci:main
-      options: --privileged
-      env:
-        ANDROID_HOME: /sdk
-        ANDROID_AVD_HOME: /root/.android/avd
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        api-level: [ 31 ]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 21
+      - uses: gradle/actions/setup-gradle@v4
         with:
-          submodules: true
-      - uses: gradle/wrapper-validation-action@v1
+          cache-encryption-key: ${{ secrets.gradle_encryption_key }}
+          cache-read-only: true
+
+      - name: Enable KVM group perms
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
 
-      - name: Cache APKs and gradle dependencies
-        uses: actions/cache@v2
+      - name: Cache AVD and APKs
+        uses: actions/cache@v4
+        id: avd-cache
         with:
-          key: ${{ runner.os }}-1
           path: |
+            ~/.android/avd/*
+            ~/.android/adb*
             ~/.apk
-            ~/.gradle/caches
-            ~/.gradle/wrapper
+          key: avd-${{ matrix.api-level }}
 
-      - name: Start emulator
-        run: start-emulator.sh
-      - name: Install task apps
-        run: |
-          mkdir .apk && cd .apk
-          wget -cq -O org.dmfs.tasks.apk https://f-droid.org/archive/org.dmfs.tasks_80800.apk && adb install org.dmfs.tasks.apk
-          wget -cq -O org.tasks.apk https://f-droid.org/archive/org.tasks_120400.apk && adb install org.tasks.apk
-          wget -cq -O at.techbee.jtx.apk https://f-droid.org/archive/at.techbee.jtx_100140002.apk && adb install at.techbee.jtx.apk
-          cd ..
-      - name: Run connected tests
-        run: ./gradlew connectedCheck -Pandroid.testInstrumentationRunnerArguments.notAnnotation=androidx.test.filters.FlakyTest
-      - name: Archive results
-        uses: actions/upload-artifact@v2
+      - name: Create AVD and generate snapshot for caching
+        if: steps.avd-cache.outputs.cache-hit != 'true'
+        uses: reactivecircus/android-emulator-runner@v2
         with:
-          name: test-results
-          path: |
-            build/reports
+          api-level: ${{ matrix.api-level }}
+          arch: x86_64
+          force-avd-creation: false
+          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          disable-animations: false
+          script: echo "Generated AVD snapshot for caching."
+
+      - name: Install task apps and run tests
+        uses: reactivecircus/android-emulator-runner@v2
+        env:
+          version_at_techbee_jtx: v2.9.0
+          version_org_tasks: 131104
+          version_org_dmfs_tasks: 82200
+        with:
+          api-level: ${{ matrix.api-level }}
+          arch: x86_64
+          force-avd-creation: false
+          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          disable-animations: true
+          script: |
+            mkdir .apk && cd .apk
+            (wget -cq -O org.dmfs.tasks.apk https://f-droid.org/repo/org.dmfs.tasks_${{ env.version_org_dmfs_tasks }}.apk || wget -cq -O org.dmfs.tasks.apk https://f-droid.org/archive/org.dmfs.tasks_${{ env.version_org_dmfs_tasks }}.apk) && adb install org.dmfs.tasks.apk
+            (wget -cq -O org.tasks.apk https://f-droid.org/repo/org.tasks_${{ env.version_org_tasks }}.apk || wget -cq -O org.tasks.apk https://f-droid.org/archive/org.tasks_${{ env.version_org_tasks }}.apk) && adb install org.tasks.apk
+            (wget -cq -O at.techbee.jtx.apk https://github.com/TechbeeAT/jtxBoard/releases/download/${{ env.version_at_techbee_jtx }}/jtxBoard-${{ env.version_at_techbee_jtx }}.apk) && adb install at.techbee.jtx.apk
+            cd ..
+            ./gradlew --build-cache --configuration-cache connectedCheck -Pandroid.testInstrumentationRunnerArguments.notAnnotation=androidx.test.filters.FlakyTest

.github/workflows/test-dev.yml

@@ -8,8 +8,9 @@
 # Files for the Dalvik VM
 *.dex
 
-# Java class files
+# Java/Kotlin files
 *.class
+.kotlin/
 
 # Generated files
 bin/

.gitignore

@@ -1,14 +1,4 @@
-# This is the list of significant contributors to ical4android.
-#
-# This does not necessarily list everyone who has contributed work.
-# To see the full list of contributors, see the revision history in
-# source control.
+You can view the list of people who have contributed to the code base in the version control history:
+https://github.com/bitfireAT/ical4android/graphs/contributors
 
-Initial contributor:
-
-* Ricki Hirner (bitfire.at)
-
-
-Further contributor:
-
-* Patrick Lang (techbee.at): jtx Board integration
+Every contribution is welcome. There are many other forms of contributing besides writing code!