diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index ab848d98c..f6c0d805f 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -14,8 +14,8 @@ jobs: - name: set up JDK uses: actions/setup-java@v3 with: - distribution: 'adopt' - java-version: 11 + distribution: "adopt" + java-version: 17 - name: assemble ViroCore run: | @@ -45,7 +45,7 @@ jobs: uses: actions/setup-java@v3 with: distribution: "adopt" - java-version: 11 + java-version: 17 - name: Code checks run: ./gradlew check - name: Archive Lint report @@ -62,8 +62,8 @@ jobs: strategy: fail-fast: false matrix: - xcode: [ '12.5.1', '13.2.1' ] - macOS: [ 'macOS-11' ] + xcode: ["12.5.1", "13.2.1"] + macOS: ["macOS-11"] steps: - uses: actions/checkout@v3.3.0 - name: Install gpg diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b04d883fa..8f9813079 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,7 +3,7 @@ name: Release with changelog on: push: tags: - - '*' + - "*" jobs: release: @@ -17,14 +17,14 @@ jobs: - name: Install JDK ${{ matrix.java_version }} uses: actions/setup-java@v3 with: - distribution: 'adopt' - java-version: 11 + distribution: "adopt" + java-version: 17 - name: Get the version id: tagger uses: jimschubert/query-tag-action@v2 with: - skip-unshallow: 'true' + skip-unshallow: "true" abbrev: false commit-ish: HEAD @@ -60,4 +60,4 @@ jobs: ./virocore/build/outputs/aar/virocore-release.aar ./sharedCode/build/outputs/aar/sharedCode-release.aar env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/android/releasetest/src/main/AndroidManifest.xml b/android/releasetest/src/main/AndroidManifest.xml index 6333e8316..8bedbcb22 100644 --- a/android/releasetest/src/main/AndroidManifest.xml +++ b/android/releasetest/src/main/AndroidManifest.xml @@ -39,9 +39,6 @@ - \ No newline at end of file diff --git a/android/renderertest/src/main/AndroidManifest.xml b/android/renderertest/src/main/AndroidManifest.xml index 5c0cf87f7..f7d1c4bb1 100644 --- a/android/renderertest/src/main/AndroidManifest.xml +++ b/android/renderertest/src/main/AndroidManifest.xml @@ -34,9 +34,6 @@ -