Merge branch 'keiyoushi:main' into main

.github/workflows/build_pull_request.yml

@@ -21,121 +21,37 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       individualMatrix: ${{ steps.generate-matrices.outputs.individualMatrix }}
-      multisrcMatrix: ${{ steps.generate-matrices.outputs.multisrcMatrix }}
-      isIndividualChanged: ${{ steps.parse-changed-files.outputs.isIndividualChanged }}
-      isMultisrcChanged: ${{ steps.parse-changed-files.outputs.isMultisrcChanged }}
-    env:
-      CI_MODULE_GEN: true
     steps:
       - name: Clone repo
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
 
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@a494d935f4b56874c4a5a87d19af7afcf3a163d0 # v2
-
-      - name: Set up JDK
-        uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4
-        with:
-          java-version: 17
-          distribution: temurin
-
-      - id: get-changed-files
-        name: Get changed files
-        uses: Ana06/get-changed-files@e0c398b7065a8d84700c471b6afc4116d1ba4e96 # v2.2.0
-
-      - id: parse-changed-files
-        name: Parse changed files
-        run: |
-          isIndividualChanged=0
-          isMultisrcChanged=0
-          for changedFile in ${{ steps.get-changed-files.outputs.all }}; do
-            if [[ ${changedFile} == src/* ]]; then
-              isIndividualChanged=1
-            elif [[ ${changedFile} == multisrc/* ]]; then
-              isMultisrcChanged=1
-            elif [[ ${changedFile} == .github/workflows/issue_moderator.yml ]]; then
-              true
-            elif [[ ${changedFile} == *.md ]]; then
-              true
-            else
-              isIndividualChanged=1
-              isMultisrcChanged=1
-              break
-            fi
-          done
-          echo "isIndividualChanged=$isIndividualChanged" >> $GITHUB_OUTPUT
-          echo "isMultisrcChanged=$isMultisrcChanged" >> $GITHUB_OUTPUT
-
-      - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@ec92e829475ac0c2315ea8f9eced72db85bb337a # v3
-
-      - name: Generate multisrc sources
-        if: ${{ steps.parse-changed-files.outputs.isMultisrcChanged == '1' }}
-        run: ./gradlew :multisrc:generateExtensions
+        uses: gradle/wrapper-validation-action@699bb18358f12c5b78b37bb0111d3a0e2276e0e2 # v2
 
       - name: Get number of modules
         run: |
           set -x
-          ./gradlew -q projects | grep '.*extensions\:\(individual\|multisrc\)\:.*\:.*' > projects.txt
+          projects=(src/*/*)
 
-          echo "NUM_INDIVIDUAL_MODULES=$(cat projects.txt | grep '.*\:individual\:.*' | wc -l)" >> $GITHUB_ENV
-          echo "NUM_MULTISRC_MODULES=$(cat projects.txt | grep '.*\:multisrc\:.*' | wc -l)" >> $GITHUB_ENV
+          echo "NUM_INDIVIDUAL_MODULES=${#projects[@]}" >> $GITHUB_ENV
 
       - id: generate-matrices
         name: Create output matrices
         uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
         with:
           script: |
             const numIndividualModules = process.env.NUM_INDIVIDUAL_MODULES;
-            const numMultisrcModules = process.env.NUM_MULTISRC_MODULES;
             const chunkSize = process.env.CI_CHUNK_SIZE;
 
             const numIndividualChunks = Math.ceil(numIndividualModules / chunkSize);
-            const numMultisrcChunks = Math.ceil(numMultisrcModules / chunkSize);
 
             console.log(`Individual modules: ${numIndividualModules} (${numIndividualChunks} chunks of ${chunkSize})`);
-            console.log(`Multi-source modules: ${numMultisrcModules} (${numMultisrcChunks} chunks of ${chunkSize})`);
 
             core.setOutput('individualMatrix', { 'chunk': [...Array(numIndividualChunks).keys()] });
-            core.setOutput('multisrcMatrix', { 'chunk': [...Array(numMultisrcChunks).keys()] });
-
-  build_multisrc:
-    name: Build multisrc modules
-    needs: prepare
-    if: ${{ needs.prepare.outputs.isMultisrcChanged == '1' }}
-    runs-on: ubuntu-latest
-    strategy:
-      matrix: ${{ fromJSON(needs.prepare.outputs.multisrcMatrix) }}
-    steps:
-      - name: Checkout PR
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
-
-      - name: Set up JDK
-        uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4
-        with:
-          java-version: 17
-          distribution: temurin
-
-      - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@ec92e829475ac0c2315ea8f9eced72db85bb337a # v3
-        with:
-          cache-read-only: true
-
-      - name: Generate sources from the multi-source library
-        env:
-          CI_MODULE_GEN: "true"
-        run: ./gradlew :multisrc:generateExtensions
-
-      - name: Build extensions (chunk ${{ matrix.chunk }})
-        env:
-          CI_MULTISRC: "true"
-          CI_CHUNK_NUM: ${{ matrix.chunk }}
-        run: ./gradlew assembleDebug
 
   build_individual:
     name: Build individual modules
     needs: prepare
-    if: ${{ needs.prepare.outputs.isIndividualChanged == '1' }}
     runs-on: ubuntu-latest
     strategy:
       matrix: ${{ fromJSON(needs.prepare.outputs.individualMatrix) }}
@@ -150,12 +66,11 @@ jobs:
           distribution: temurin
 
       - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@ec92e829475ac0c2315ea8f9eced72db85bb337a # v3
+        uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3
         with:
           cache-read-only: true
 
       - name: Build extensions (chunk ${{ matrix.chunk }})
         env:
-          CI_MULTISRC: "false"
           CI_CHUNK_NUM: ${{ matrix.chunk }}
-        run: ./gradlew assembleDebug
+        run: ./gradlew -p src assembleDebug

.github/workflows/build_push.yml

@@ -24,101 +24,33 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       individualMatrix: ${{ steps.generate-matrices.outputs.individualMatrix }}
-      multisrcMatrix: ${{ steps.generate-matrices.outputs.multisrcMatrix }}
-    env:
-      CI_MODULE_GEN: true
     steps:
       - name: Clone repo
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
 
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@a494d935f4b56874c4a5a87d19af7afcf3a163d0 # v2
-
-      - name: Set up JDK
-        uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4
-        with:
-          java-version: 17
-          distribution: temurin
-
-      - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@ec92e829475ac0c2315ea8f9eced72db85bb337a # v3
-
-      - name: Generate multisrc sources
-        run: ./gradlew :multisrc:generateExtensions
+        uses: gradle/wrapper-validation-action@699bb18358f12c5b78b37bb0111d3a0e2276e0e2 # v2
 
       - name: Get number of modules
         run: |
           set -x
-          ./gradlew -q projects | grep '.*extensions\:\(individual\|multisrc\)\:.*\:.*' > projects.txt
+          projects=(src/*/*)
 
-          echo "NUM_INDIVIDUAL_MODULES=$(cat projects.txt | grep '.*\:individual\:.*' | wc -l)" >> $GITHUB_ENV
-          echo "NUM_MULTISRC_MODULES=$(cat projects.txt | grep '.*\:multisrc\:.*' | wc -l)" >> $GITHUB_ENV
+          echo "NUM_INDIVIDUAL_MODULES=${#projects[@]}" >> $GITHUB_ENV
 
       - id: generate-matrices
         name: Create output matrices
         uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
         with:
           script: |
             const numIndividualModules = process.env.NUM_INDIVIDUAL_MODULES;
-            const numMultisrcModules = process.env.NUM_MULTISRC_MODULES;
             const chunkSize = process.env.CI_CHUNK_SIZE;
 
             const numIndividualChunks = Math.ceil(numIndividualModules / chunkSize);
-            const numMultisrcChunks = Math.ceil(numMultisrcModules / chunkSize);
 
             console.log(`Individual modules: ${numIndividualModules} (${numIndividualChunks} chunks of ${chunkSize})`);
-            console.log(`Multi-source modules: ${numMultisrcModules} (${numMultisrcChunks} chunks of ${chunkSize})`);
 
             core.setOutput('individualMatrix', { 'chunk': [...Array(numIndividualChunks).keys()] });
-            core.setOutput('multisrcMatrix', { 'chunk': [...Array(numMultisrcChunks).keys()] });
-
-  build_multisrc:
-    name: Build multisrc modules
-    needs: prepare
-    runs-on: ubuntu-latest
-    strategy:
-      matrix: ${{ fromJSON(needs.prepare.outputs.multisrcMatrix) }}
-    steps:
-      - name: Checkout main branch
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
-
-      - name: Set up JDK
-        uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4
-        with:
-          java-version: 17
-          distribution: temurin
-
-      - name: Prepare signing key
-        run: |
-          echo ${{ secrets.SIGNING_KEY }} | base64 -d > signingkey.jks
-
-      - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@ec92e829475ac0c2315ea8f9eced72db85bb337a # v3
-
-      - name: Generate sources from the multi-source library
-        env:
-          CI_MODULE_GEN: "true"
-        run: ./gradlew :multisrc:generateExtensions
-
-      - name: Build extensions (chunk ${{ matrix.chunk }})
-        env:
-          CI_MULTISRC: "true"
-          CI_CHUNK_NUM: ${{ matrix.chunk }}
-          ALIAS: ${{ secrets.ALIAS }}
-          KEY_STORE_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }}
-          KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
-        run: ./gradlew assembleRelease
-
-      - name: Upload APKs (chunk ${{ matrix.chunk }})
-        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4
-        if: "github.repository == 'keiyoushi/extensions-source'"
-        with:
-          name: "multisrc-apks-${{ matrix.chunk }}"
-          path: "**/*.apk"
-          retention-days: 1
-
-      - name: Clean up CI files
-        run: rm signingkey.jks
 
   build_individual:
     name: Build individual modules
@@ -141,16 +73,15 @@ jobs:
           echo ${{ secrets.SIGNING_KEY }} | base64 -d > signingkey.jks
 
       - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@ec92e829475ac0c2315ea8f9eced72db85bb337a # v3
+        uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3
 
       - name: Build extensions (chunk ${{ matrix.chunk }})
         env:
-          CI_MULTISRC: "false"
           CI_CHUNK_NUM: ${{ matrix.chunk }}
           ALIAS: ${{ secrets.ALIAS }}
           KEY_STORE_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }}
           KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
-        run: ./gradlew assembleRelease
+        run: ./gradlew -p src assembleRelease
 
       - name: Upload APKs (chunk ${{ matrix.chunk }})
         uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4
@@ -166,13 +97,12 @@ jobs:
   publish_repo:
     name: Publish repo
     needs:
-      - build_multisrc
       - build_individual
     if: "github.repository == 'keiyoushi/extensions-source'"
     runs-on: ubuntu-latest
     steps:
       - name: Download APK artifacts
-        uses: actions/download-artifact@eaceaf801fd36c7dee90939fad912460b18a1ffe # v4
+        uses: actions/download-artifact@87c55149d96e628cc2ef7e6fc2aab372015aec85 # v4
         with:
           path: ~/apk-artifacts
 

.github/workflows/issue_moderator.yml

@@ -53,7 +53,7 @@ jobs:
                 "type": "body",
                 "regex": "- \\[[xX]\\] I have admitted that I am a clown by having checked this box, as I have not read these acknowledgements\\.",
                 "labels": [":clown_face:"],
-                "message": "You have not carefully read the acknowledgements."
+                "message": "You have not carefully read the acknowledgements. Read them again and edit the checkboxes before reopening the issue."
               },
               {
                 "type": "both",

CONTRIBUTING.md

@@ -423,14 +423,15 @@ will be cached.
 
       ```kotlin
       private fun parseDate(dateStr: String): Long {
-          return runCatching { DATE_FORMATTER.parse(dateStr)?.time }
-              .getOrNull() ?: 0L
+          return try {
+              dateFormat.parse(dateStr)!!.time
+          } catch (_: ParseException) {
+              0L
+          }
       }
 
-      companion object {
-          private val DATE_FORMATTER by lazy {
-              SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.ENGLISH)
-          }
+      private val dateFormat by lazy {
+          SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.ENGLISH)
       }
       ```
 

build.gradle.kts

@@ -1,17 +1,3 @@
-buildscript {
-    repositories {
-        mavenCentral()
-        google()
-        maven(url = "https://plugins.gradle.org/m2/")
-    }
-    dependencies {
-        classpath(libs.gradle.agp)
-        classpath(libs.gradle.kotlin)
-        classpath(libs.gradle.serialization)
-        classpath(libs.gradle.kotlinter)
-    }
-}
-
 allprojects {
     repositories {
         mavenCentral()

buildSrc/build.gradle.kts

@@ -3,5 +3,14 @@ plugins {
 }
 
 repositories {
+    gradlePluginPortal()
     mavenCentral()
+    google()
+}
+
+dependencies {
+    implementation(libs.gradle.agp)
+    implementation(libs.gradle.kotlin)
+    implementation(libs.gradle.serialization)
+    implementation(libs.gradle.kotlinter)
 }

buildSrc/settings.gradle.kts

@@ -0,0 +1,7 @@
+dependencyResolutionManagement {
+    versionCatalogs {
+        create("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
+}

buildSrc/src/main/kotlin/Extensions.kt

@@ -0,0 +1,6 @@
+import org.gradle.api.plugins.ExtensionAware
+import org.gradle.kotlin.dsl.extra
+
+var ExtensionAware.baseVersionCode: Int
+    get() = extra.get("baseVersionCode") as Int
+    set(value) = extra.set("baseVersionCode", value)