Merge branch 'molly-6.14'

.dockerignore

@@ -11,4 +11,3 @@
 **/test/androidTestEspresso/res/values/arrays.xml
 reproducible-builds/certs
 reproducible-builds/outputs
-reproducible-builds/test-reports

.editorconfig

@@ -2,3 +2,6 @@ root = true
 
 [*.kt]
 indent_size = 2
+ktlint_standard_trailing-comma-on-call-site = disable
+ktlint_standard_trailing-comma-on-declaration-site = disable
+ktlink_standard_spacing-between-declarations-with-annotations = disable

.github/workflows/prerelease.yml

@@ -14,19 +14,12 @@ jobs:
     if: "github.event.base_ref != 'refs/heads/main'"
     runs-on: ubuntu-22.04
     env:
+      GRADLE_OPTS: "-Dorg.gradle.project.kotlin.compiler.execution.strategy=in-process"
       CI_MAPS_API_KEY: ${{ secrets.MAPS_API_KEY }}
 
     steps:
       - uses: actions/checkout@v3
 
-      - name: Increase swap space
-        run: |
-          sudo fallocate -l 8G /swapB
-          sudo chmod 600 /swapB
-          sudo mkswap /swapB
-          sudo swapon /swapB
-          swapon --show
-
       - name: Set up builder image
         run: docker-compose build
         working-directory: reproducible-builds

.github/workflows/release.yml

@@ -14,19 +14,12 @@ jobs:
     if: "github.event.base_ref == 'refs/heads/main'"
     runs-on: ubuntu-22.04
     env:
+      GRADLE_OPTS: "-Dorg.gradle.project.kotlin.compiler.execution.strategy=in-process"
       CI_MAPS_API_KEY: ${{ secrets.MAPS_API_KEY }}
 
     steps:
       - uses: actions/checkout@v3
 
-      - name: Increase swap space
-        run: |
-          sudo fallocate -l 8G /swapB
-          sudo chmod 600 /swapB
-          sudo mkswap /swapB
-          sudo swapon /swapB
-          swapon --show
-
       - name: Set up builder image
         run: docker-compose build
         working-directory: reproducible-builds

.github/workflows/reprocheck.yml

@@ -23,21 +23,14 @@ jobs:
     name: Build new
     runs-on: ubuntu-22.04
     env:
+      GRADLE_OPTS: "-Dorg.gradle.project.kotlin.compiler.execution.strategy=in-process"
       CI_MAPS_API_KEY: ${{ secrets.MAPS_API_KEY }}
 
     steps:
       - uses: actions/checkout@v3
         with:
           ref: "${{ env.TAG_NAME }}"
 
-      - name: Increase swap space
-        run: |
-          sudo fallocate -l 8G /swapB
-          sudo chmod 600 /swapB
-          sudo mkswap /swapB
-          sudo swapon /swapB
-          swapon --show
-
       - name: Set up builder image
         run: docker-compose build
         working-directory: reproducible-builds

.github/workflows/test.yml

@@ -10,6 +10,9 @@ on:
       - '.github/FUNDING.yml'
       - '.github/ISSUE_TEMPLATE/**'
 
+permissions:
+  contents: read # to fetch code (actions/checkout)
+
 jobs:
   wrapper_validation:
     name: Validate Gradle wrapper
@@ -18,41 +21,31 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
-        with:
-          distribution: temurin
-          java-version: 11
-
       - name: Run wrapper validation
-        uses: gradle/wrapper-validation-action@master
+        uses: gradle/wrapper-validation-action@v1
 
   test:
     name: Run tests
     runs-on: ubuntu-22.04
+    env:
+      GRADLE_OPTS: "-Dorg.gradle.project.kotlin.compiler.execution.strategy=in-process"
 
     steps:
       - uses: actions/checkout@v3
 
-      - name: Increase swap space
-        run: |
-          sudo fallocate -l 8G /swapB
-          sudo chmod 600 /swapB
-          sudo mkswap /swapB
-          sudo swapon /swapB
-          swapon --show
-
-      - name: Set up builder image
-        run: docker-compose build
-        working-directory: reproducible-builds
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 11
+          cache: gradle
 
       - name: Run tests
-        run: docker-compose run test
-        working-directory: reproducible-builds
+        run: ./gradlew build --no-daemon
 
       - name: Archive reports for failed tests
         if: "failure()"
         uses: actions/upload-artifact@v3
         with:
           name: test-reports
-          path: "reproducible-builds/test-reports"
+          path: '*/build/reports'

.gitignore

@@ -11,4 +11,3 @@ signing.properties
 test/androidTestEspresso/res/values/arrays.xml
 /reproducible-builds/certs
 /reproducible-builds/outputs
-/reproducible-builds/test-reports

Dockerfile

@@ -34,6 +34,4 @@ COPY . /molly/
 WORKDIR /molly
 RUN git clean -df
 
-ENV ORG_GRADLE_PROJECT_CI=true
-
-ENTRYPOINT ["./gradlew"]
+ENTRYPOINT ["./gradlew", "-PCI=true"]