diff --git a/.github/workflows/check-pr-title.yml b/.github/workflows/check-pr-title.yml deleted file mode 100644 index 1842f5bf3..000000000 --- a/.github/workflows/check-pr-title.yml +++ /dev/null @@ -1,22 +0,0 @@ -# NOTE: This is a common file that is overwritten by realm/ci-actions sync service -# and should only be modified in that repository. - -name: "Check PR Title" -on: - pull_request: - types: [opened, synchronize, reopened, ready_for_review, labeled, unlabeled, converted_to_draft, edited] - -jobs: - check-pr-title: - name: Check PR Title - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - with: - submodules: false - - name: Enforce PR title - uses: realm/ci-actions/title-checker@main - with: - regex: R[A-Z]{2,6}-[0-9]{1,6} - error-hint: Invalid PR title. Make sure it's prefixed with the JIRA ticket the PR addresses or add the no-jira-ticket label. - ignore-labels: 'no-jira-ticket' \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e866b86a7..513595ec6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,9 +27,9 @@ jobs: name: Build MacOS uses: ./.github/workflows/build-native.yml with: - runner: macos-latest - binary: macos - build: '["macos"]' + runner: macos-latest + binary: macos + build: '["macos"]' build-linux: name: Build Linux @@ -406,14 +406,14 @@ jobs: sudo udevadm control --reload-rules sudo udevadm trigger --name-match=kvm - - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3 - - name: Setup Java uses: actions/setup-java@v4 with: distribution: "temurin" - java-version: 11 + java-version: 21 + + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v4 - name: Fetch artifacts uses: actions/download-artifact@v4 @@ -437,7 +437,7 @@ jobs: path: | ~/.android/avd/* ~/.android/adb* - key: avd-33-x86_64 + key: avd-31-x86_64_2 - name: Create Android Emulator and generate snapshot for caching if: ${{ steps.avd-cache.outputs.cache-hit != 'true' }} @@ -448,9 +448,8 @@ jobs: emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none api-level: 31 arch: x86_64 - ndk: 25.2.9519653 - cmake: 3.10.2.4988404 script: echo "Generated Emulator snapshot for caching." + ndk: 27.0.12077973 - name: Run tests on Android Emulator uses: reactivecircus/android-emulator-runner@v2 @@ -460,9 +459,8 @@ jobs: emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none api-level: 31 arch: x86_64 - ndk: 25.2.9519653 - cmake: 3.10.2.4988404 script: cd packages/realm/tests && flutter test integration_test/all_tests.dart --dart-define=BAAS_BAASAAS_API_KEY=$BAAS_BAASAAS_API_KEY --dart-define=BAAS_DIFFERENTIATOR=$BAAS_DIFFERENTIATOR --file-reporter=json:test-results.json --suppress-analytics + ndk: 27.0.12077973 - name: Publish Test Report uses: dorny/test-reporter@v1.8.0 @@ -592,7 +590,7 @@ jobs: ** <{{refUrl}}|`{{ref}}` - {{description}}> {{#if description}}<{{diffUrl}}|branch: `{{diffRef}}`>{{/if}} - + web-compile: name: Compile for web runs-on: ubuntu-latest diff --git a/packages/realm/android/build.gradle b/packages/realm/android/build.gradle index 3ae9aa0fb..e774a16db 100644 --- a/packages/realm/android/build.gradle +++ b/packages/realm/android/build.gradle @@ -36,7 +36,7 @@ android { abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64' } } - + sourceSets { main { java { @@ -45,7 +45,7 @@ android { jniLibs.srcDirs += ["src/main/cpp/lib/"] } } - + lintOptions { disable 'InvalidPackage' } @@ -134,11 +134,11 @@ def getBundleId() { tasks.register("generateRealmConfig", Copy) { outputs.upToDateWhen { false } - + def bundleId = getBundleId(); from 'src/gen' into "$buildDir/realm-generated" filter { line -> line.replaceAll('realm_bundle_id', "${bundleId}") } } -preBuild.dependsOn runMetrics, downloadRealmBinaries, generateRealmConfig \ No newline at end of file +preBuild.dependsOn runMetrics, downloadRealmBinaries, generateRealmConfig diff --git a/packages/realm/tests/android/gradle/wrapper/gradle-wrapper.properties b/packages/realm/tests/android/gradle/wrapper/gradle-wrapper.properties index 3c472b99c..348c409ea 100644 --- a/packages/realm/tests/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/realm/tests/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip diff --git a/packages/realm/tests/android/settings.gradle b/packages/realm/tests/android/settings.gradle index 7cd712855..0b11d083a 100644 --- a/packages/realm/tests/android/settings.gradle +++ b/packages/realm/tests/android/settings.gradle @@ -23,7 +23,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "7.3.0" apply false + id "com.android.application" version '8.7.0' apply false } include ":app"