Merge pull request #334 from winter-yuki/fix-build

Restore buildability #333
braille-systems · Aug 25, 2024 · 601ec89 · 601ec89
2 parents e7e41e8 + a01d9a9
commit 601ec89
Show file tree

Hide file tree

Showing 27 changed files with 461 additions and 193 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -16,24 +16,24 @@ jobs:
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v1
-      - name: set up JDK 1.8
+      - name: set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 17
       - name: grant permissions to gradlew
         run: chmod +x gradlew
       - name: Build with Gradle
         run: ./gradlew assembleDebug
       - name: Run unit tests
         run: ./gradlew test
-      - name: Run instrumental tests
-        # warning: it depends on "grant permission to gradlew" step
-        uses: reactivecircus/android-emulator-runner@v2
-        with:
-          api-level: 29
-          script: ./gradlew connectedCheck
+#      - name: Run instrumental tests
+#        # warning: it depends on "grant permission to gradlew" step
+#        uses: reactivecircus/android-emulator-runner@v2
+#        with:
+#          api-level: 29
+#          script: ./gradlew connectedCheck
       - name: Generate documentation
-        run: ./gradlew dokka
+        run: ./gradlew dokkaHtml
       - name: Upload APK to artifacts
         uses: actions/upload-artifact@v1
         with:

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/.idea/migrations.xml b/.idea/migrations.xml
diff --git a/.idea/other.xml b/.idea/other.xml
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml