diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..2c20ea6 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,110 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for all configuration options: +# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file + +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "daily" + reviewers: + - "mvanbeusekom" + labels: + - "platform: ci" + + - package-ecosystem: "gradle" + directory: "/google_api_availability_android/android" + commit-message: + prefix: "[google_api_availability_android]" + schedule: + interval: "weekly" + reviewers: + - "mvanbeusekom" + open-pull-requests-limit: 10 + ignore: + - dependency-name: "com.android.tools.build:gradle" + update-types: ["version-update:semver-minor", "version-update:semver-patch"] + - dependency-name: "junit:junit" + update-types: ["version-update:semver-minor", "version-update:semver-patch"] + - dependency-name: "org.mockito:*" + update-types: ["version-update:semver-minor", "version-update:semver-patch"] + - dependency-name: "androidx.test:*" + update-types: ["version-update:semver-minor", "version-update:semver-patch"] + + - package-ecosystem: "gradle" + directory: "/google_api_availability_android/example/android/app" + commit-message: + prefix: "[google_api_availability_android]" + schedule: + interval: "weekly" + reviewers: + - "mvanbeusekom" + open-pull-requests-limit: 10 + ignore: + - dependency-name: "*" + update-types: ["version-update:semver-minor", "version-update:semver-patch"] + + - package-ecosystem: "gradle" + directory: "/google_api_availability/example/android/app" + commit-message: + prefix: "[google_api_availability]" + schedule: + interval: "weekly" + reviewers: + - "mvanbeusekom" + open-pull-requests-limit: 10 + ignore: + - dependency-name: "*" + update-types: ["version-update:semver-minor", "version-update:semver-patch"] + + - package-ecosystem: "pub" + directory: "/google_api_availability" + commit-message: + prefix: "[google_api_availability]" + schedule: + interval: "weekly" + reviewers: + - "mvanbeusekom" + open-pull-requests-limit: 10 + + - package-ecosystem: "pub" + directory: "/google_api_availability/example" + commit-message: + prefix: "[google_api_availability]" + schedule: + interval: "weekly" + reviewers: + - "mvanbeusekom" + open-pull-requests-limit: 10 + + - package-ecosystem: "pub" + directory: "/google_api_availability_android" + commit-message: + prefix: "[google_api_availability_android]" + schedule: + interval: "weekly" + reviewers: + - "mvanbeusekom" + open-pull-requests-limit: 10 + + - package-ecosystem: "pub" + directory: "/google_api_availability_android/example" + commit-message: + prefix: "[google_api_availability_android]" + schedule: + interval: "weekly" + reviewers: + - "mvanbeusekom" + open-pull-requests-limit: 10 + + - package-ecosystem: "pub" + directory: "/google_api_availability_platform_interface" + commit-message: + prefix: "[google_api_availability_platform_interface]" + schedule: + interval: "weekly" + reviewers: + - "mvanbeusekom" + open-pull-requests-limit: 10 diff --git a/.github/workflows/google_api_availability.yaml b/.github/workflows/google_api_availability.yaml deleted file mode 100644 index 3132e03..0000000 --- a/.github/workflows/google_api_availability.yaml +++ /dev/null @@ -1,60 +0,0 @@ -# This is a basic workflow to help you get started with Actions - -name: google_api_availability - -# Controls when the action will run. Triggers the workflow on push or pull request -# events but only for the develop branch -on: - push: - branches: [ main ] - paths: - - 'google_api_availability/**' - pull_request: - branches: [ main ] - paths: - - 'google_api_availability/**' - -# A workflow run is made up of one or more jobs that can run sequentially or in parallel -jobs: - # Job configuration for the google_api_availability (App Facing Package) - google_api_availability: - # The type of runner that the job will run on - runs-on: macos-latest - env: - source-directory: ./google_api_availability - example-directory: ./google_api_availability/example - - # Steps represent a sequence of tasks that will be executed as part of the job - steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v3 - - # Make sure the stable version of Flutter is available - - uses: subosito/flutter-action@v2 - with: - channel: 'stable' - - # Download all Flutter packages the google_api_availability depends on - - name: Download dependencies - run: flutter pub get - working-directory: ${{env.source-directory}} - - # Run dart Format to ensure formatting is valid - - name: Run dart Format - run: dart format --set-exit-if-changed . - working-directory: ${{env.source-directory}} - - # Run Flutter Analyzer - - name: Run Flutter Analyzer - run: flutter analyze - working-directory: ${{env.source-directory}} - - # Build Android version of the example app - - name: Run Android build - run: flutter build apk --release - working-directory: ${{env.example-directory}} - - # Run all unit-tests with code coverage - - name: Run unit tests - run: flutter test --coverage - working-directory: ${{env.source-directory}} \ No newline at end of file diff --git a/.github/workflows/google_api_availability_android.yaml b/.github/workflows/google_api_availability_android.yaml deleted file mode 100644 index 3471c88..0000000 --- a/.github/workflows/google_api_availability_android.yaml +++ /dev/null @@ -1,56 +0,0 @@ -# This is a basic workflow to help you get started with Actions -name: google_api_availability_android - -# Controls when the action will run. Triggers the workflow on push or pull request -# events but only for the main branch -on: - push: - branches: [ main ] - paths: - - 'google_api_availability_android/**' - pull_request: - branches: [ main ] - paths: - - 'google_api_availability_android/**' - -# A workflow run is made up of one or more jobs that can run sequentially or in parallel -jobs: - ci: - name: Android platform package - - # The type of runner that the job will run on - runs-on: ubuntu-latest - - env: - source-directory: ./google_api_availability_android - example-directory: ./google_api_availability_android/example - - # Steps represent a sequence of tasks that will be executed as part of the job - steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v3 - - # Make sure the stable version of Flutter is available - - uses: subosito/flutter-action@v2 - with: - channel: 'stable' - - # Download all Flutter packages - - name: Download dependencies - run: flutter pub get - working-directory: ${{env.source-directory}} - - # Run dart Format to ensure formatting is valid - - name: Run dart Format - run: dart format --set-exit-if-changed . - working-directory: ${{env.source-directory}} - - # Run Flutter Analyzer - - name: Run Flutter Analyzer - run: flutter analyze - working-directory: ${{env.source-directory}} - - # Build Android version of the example App - - name: Run Android build - run: flutter build apk --release - working-directory: ${{env.example-directory}} diff --git a/.github/workflows/google_api_availability_ci.yaml b/.github/workflows/google_api_availability_ci.yaml new file mode 100644 index 0000000..65cdfa8 --- /dev/null +++ b/.github/workflows/google_api_availability_ci.yaml @@ -0,0 +1,100 @@ +name: Google API Availability - Continuous Integration + +# Single entry point for CI. Every package is checked by the reusable +# google_api_availability_package.yaml, and only when that package changed. +# Make `ci-result` the only required status check: it reports on every run, +# also when the package jobs are skipped. +# +# Starting it by hand runs every package, for example to check main against a +# new Flutter stable release. +on: + push: + branches: [main] + pull_request: + branches: [main] + workflow_dispatch: + +# A new push to a pull request cancels the run for the previous one. Every other +# run gets a group of its own and is never cancelled, so every merged commit and +# every manual run gets a result. +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }} + cancel-in-progress: ${{ github.event_name == 'pull_request' }} + +# The called workflow inherits these and can only narrow them. paths-filter +# reads the changed files of a pull request through the API. +permissions: + contents: read + pull-requests: read + +jobs: + changes: + runs-on: ubuntu-latest + outputs: + android: ${{ steps.filter.outputs.android }} + platform_interface: ${{ steps.filter.outputs.platform_interface }} + app_facing: ${{ steps.filter.outputs.app_facing }} + steps: + - uses: actions/checkout@v7 + - uses: dorny/paths-filter@v4 + id: filter + if: github.event_name != 'workflow_dispatch' + with: + # The packages are not a pub workspace: each one resolves its + # siblings from pub.dev, so a package only needs checking when its + # own sources or the CI configuration changed. + filters: | + shared: &shared + - '.github/workflows/google_api_availability_ci.yaml' + - '.github/workflows/google_api_availability_package.yaml' + platform_interface: + - *shared + - 'google_api_availability_platform_interface/**' + android: + - *shared + - 'google_api_availability_android/**' + app_facing: + - *shared + - 'google_api_availability/**' + + platform_interface: + needs: changes + if: github.event_name == 'workflow_dispatch' || needs.changes.outputs.platform_interface == 'true' + uses: ./.github/workflows/google_api_availability_package.yaml + with: + package: google_api_availability_platform_interface + runs-on: ubuntu-latest + unit-tests: true + + android: + needs: changes + if: github.event_name == 'workflow_dispatch' || needs.changes.outputs.android == 'true' + uses: ./.github/workflows/google_api_availability_package.yaml + with: + package: google_api_availability_android + runs-on: ubuntu-latest + java: true + unit-tests: true + example-build: flutter build apk --release + + # The plugin only supports Android, so the example is only built for Android. + app_facing: + needs: changes + if: github.event_name == 'workflow_dispatch' || needs.changes.outputs.app_facing == 'true' + uses: ./.github/workflows/google_api_availability_package.yaml + with: + package: google_api_availability + runs-on: ubuntu-latest + java: true + unit-tests: true + example-build: flutter build apk --release + + ci-result: # ← the only required check + needs: [changes, platform_interface, android, app_facing] + if: always() + runs-on: ubuntu-latest + steps: + - run: | + if [[ "${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }}" == "true" ]]; then + exit 1 + fi diff --git a/.github/workflows/google_api_availability_package.yaml b/.github/workflows/google_api_availability_package.yaml new file mode 100644 index 0000000..1159bd1 --- /dev/null +++ b/.github/workflows/google_api_availability_package.yaml @@ -0,0 +1,75 @@ +name: Package - Continuous Integration + +# Called from google_api_availability_ci.yaml, once for every package that needs +# checking: format, analyze, the unit tests where the package has them, and the +# example build. +on: + workflow_call: + inputs: + package: + description: The package directory, relative to the repository root. + type: string + required: true + runs-on: + description: The runner to use. + type: string + required: true + java: + description: Install JDK 17, which an Android example build needs. + type: boolean + default: false + unit-tests: + description: Run the unit tests with `flutter test`. + type: boolean + default: false + example-build: + description: Commands that build the example, run in `/example`. + type: string + default: "" + +jobs: + ci: + name: ${{ inputs.package }} + runs-on: ${{ inputs.runs-on }} + + # Bash on every runner, so a multi-line example build stops at its first + # failing command. GitHub runs it as `bash -eo pipefail`. + defaults: + run: + shell: bash + working-directory: ${{ inputs.package }} + + steps: + - uses: actions/checkout@v7 + + - name: Install JDK 17 + if: inputs.java + uses: actions/setup-java@v6 + with: + distribution: "temurin" + java-version: "17" + + - name: Install Flutter + uses: subosito/flutter-action@v2 + with: + channel: "stable" + + - name: Download dependencies + run: flutter pub get + + - name: Run Dart Format + run: dart format --set-exit-if-changed . + + - name: Run Flutter Analyzer + run: flutter analyze + + - name: Run unit tests + if: inputs.unit-tests + run: flutter test + + # The commands come from google_api_availability_ci.yaml, never from the + # event, so expanding them into the script is safe. + - name: Build example + if: inputs.example-build != '' + working-directory: ${{ inputs.package }}/example + run: ${{ inputs.example-build }} diff --git a/.github/workflows/google_api_availability_platform_interface.yaml b/.github/workflows/google_api_availability_platform_interface.yaml deleted file mode 100644 index 388457f..0000000 --- a/.github/workflows/google_api_availability_platform_interface.yaml +++ /dev/null @@ -1,55 +0,0 @@ -# This is a basic workflow to help you get started with Actions -name: google_api_availability_platform_interface - -# Controls when the action will run. Triggers the workflow on push or pull request -# events but only for the main branch -on: - push: - branches: [ main ] - paths: - - 'google_api_availability_platform_interface/**' - pull_request: - branches: [ main ] - paths: - - 'google_api_availability_platform_interface/**' - -# A workflow run is made up of one or more jobs that can run sequentially or in parallel -jobs: - build: - name: Format - - # The type of runner that the job will run on - runs-on: ubuntu-latest - - env: - source-directory: ./google_api_availability_platform_interface - - # Steps represent a sequence of tasks that will be executed as part of the job - steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v3 - - # Make sure the stable version of Flutter is available - - uses: subosito/flutter-action@v2 - with: - channel: 'stable' - - # Download all Flutter packages - - name: Download dependencies - run: flutter pub get - working-directory: ${{env.source-directory}} - - # Run dart Format to ensure formatting is valid - - name: Run dart Format - run: dart format --set-exit-if-changed . - working-directory: ${{env.source-directory}} - - # Run Flutter Analyzer - - name: Run Flutter Analyzer - run: flutter analyze - working-directory: ${{env.source-directory}} - - # Run all unit-tests with code coverage - - name: Run unit tests - run: flutter test --coverage - working-directory: ${{env.source-directory}} diff --git a/.github/workflows/no-response.yaml b/.github/workflows/no-response.yaml index 6761fbb..7d97d6e 100644 --- a/.github/workflows/no-response.yaml +++ b/.github/workflows/no-response.yaml @@ -39,7 +39,7 @@ jobs: # the `status: needs more info` label, the issue should be closed automatically. # 5. Set the `close-issue-message` parameter with a text that will be placed as a comment to the respective issue that # is closed to explain why the issue was closed. - - uses: actions/stale@v8 + - uses: actions/stale@v10 with: stale-issue-label: 'status: needs more info' days-before-stale: -1 diff --git a/google_api_availability/CHANGELOG.md b/google_api_availability/CHANGELOG.md index a277e78..d70c150 100644 --- a/google_api_availability/CHANGELOG.md +++ b/google_api_availability/CHANGELOG.md @@ -1,3 +1,8 @@ +## 5.1.0 + +* Updates the minimum supported Flutter version to 3.24, matching the Dart 3.5 + SDK constraint. + ## 5.0.1 * Updated example project Gradle build versions. diff --git a/google_api_availability/example/android/.gitignore b/google_api_availability/example/android/.gitignore index 65b7315..be3943c 100644 --- a/google_api_availability/example/android/.gitignore +++ b/google_api_availability/example/android/.gitignore @@ -1,10 +1,14 @@ -*.iml -*.class -.gradle +gradle-wrapper.jar +/.gradle +/captures/ +/gradlew +/gradlew.bat /local.properties -/.idea/workspace.xml -/.idea/libraries -.DS_Store -/build -/captures GeneratedPluginRegistrant.java +.cxx/ + +# Remember to never publicly share your keystore. +# See https://flutter.dev/to/reference-keystore +key.properties +**/*.keystore +**/*.jks diff --git a/google_api_availability/example/android/.settings/org.eclipse.buildship.core.prefs b/google_api_availability/example/android/.settings/org.eclipse.buildship.core.prefs deleted file mode 100644 index 9851512..0000000 --- a/google_api_availability/example/android/.settings/org.eclipse.buildship.core.prefs +++ /dev/null @@ -1,13 +0,0 @@ -arguments= -auto.sync=false -build.scans.enabled=false -connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER) -connection.project.dir= -eclipse.preferences.version=1 -gradle.user.home= -java.home=/Library/Java/JavaVirtualMachines/adoptopenjdk-11.jdk/Contents/Home -jvm.arguments= -offline.mode=false -override.workspace.settings=true -show.console.view=true -show.executions.view=true diff --git a/google_api_availability/example/android/app/.classpath b/google_api_availability/example/android/app/.classpath deleted file mode 100644 index eb19361..0000000 --- a/google_api_availability/example/android/app/.classpath +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/google_api_availability/example/android/app/.settings/org.eclipse.buildship.core.prefs b/google_api_availability/example/android/app/.settings/org.eclipse.buildship.core.prefs deleted file mode 100644 index b1886ad..0000000 --- a/google_api_availability/example/android/app/.settings/org.eclipse.buildship.core.prefs +++ /dev/null @@ -1,2 +0,0 @@ -connection.project.dir=.. -eclipse.preferences.version=1 diff --git a/google_api_availability/example/android/app/build.gradle b/google_api_availability/example/android/app/build.gradle deleted file mode 100644 index 2ae97ac..0000000 --- a/google_api_availability/example/android/app/build.gradle +++ /dev/null @@ -1,64 +0,0 @@ -plugins { - id "com.android.application" - id "dev.flutter.flutter-gradle-plugin" - } - -def localProperties = new Properties() -def localPropertiesFile = rootProject.file('local.properties') -if (localPropertiesFile.exists()) { - localPropertiesFile.withReader('UTF-8') { reader -> - localProperties.load(reader) - } -} - -def flutterVersionCode = localProperties.getProperty('flutter.versionCode') -if (flutterVersionCode == null) { - flutterVersionCode = '1' -} - -def flutterVersionName = localProperties.getProperty('flutter.versionName') -if (flutterVersionName == null) { - flutterVersionName = '1.0' -} - -android { - namespace 'com.baseflow.googleapiavailabilityexample' - compileSdkVersion flutter.compileSdkVersion - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - - lintOptions { - disable 'InvalidPackage' - } - - defaultConfig { - // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "com.baseflow.googleapiavailabilityexample" - minSdkVersion flutter.minSdkVersion - targetSdkVersion flutter.targetSdkVersion - versionCode flutterVersionCode.toInteger() - versionName flutterVersionName - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - } - - buildTypes { - release { - // TODO: Add your own signing config for the release build. - // Signing with the debug keys for now, so `flutter run --release` works. - signingConfig signingConfigs.debug - } - } -} - -flutter { - source '../..' -} - -dependencies { - androidTestImplementation 'androidx.test:runner:1.2.0' - androidTestImplementation 'androidx.test:rules:1.2.0' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' -} \ No newline at end of file diff --git a/google_api_availability/example/android/app/build.gradle.kts b/google_api_availability/example/android/app/build.gradle.kts new file mode 100644 index 0000000..fe15785 --- /dev/null +++ b/google_api_availability/example/android/app/build.gradle.kts @@ -0,0 +1,49 @@ +plugins { + id("com.android.application") + // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. + id("dev.flutter.flutter-gradle-plugin") +} + +android { + namespace = "com.baseflow.googleapiavailabilityexample" + compileSdk = flutter.compileSdkVersion + ndkVersion = flutter.ndkVersion + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + + defaultConfig { + // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). + applicationId = "com.baseflow.googleapiavailabilityexample" + // You can update the following values to match your application needs. + // For more information, see: https://flutter.dev/to/review-gradle-config. + minSdk = flutter.minSdkVersion + targetSdk = flutter.targetSdkVersion + // Uses the version code from pubspec.yaml. When using split APKs, 1000 * ABI_VERSION + // is added automatically by Flutter. (https://developer.android.com/studio/build/configure-apk-splits#configure-APK-versions) + // You can force using the value of versionCode by specifying the `-P force-version-code-ignoring-abi=true` + // flag during build. + versionCode = flutter.versionCode + versionName = flutter.versionName + } + + buildTypes { + release { + // TODO: Add your own signing config for the release build. + // Signing with the debug keys for now, so `flutter run --release` works. + signingConfig = signingConfigs.getByName("debug") + } + } +} + +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} + +flutter { + source = "../.." +} diff --git a/google_api_availability/example/android/app/src/debug/AndroidManifest.xml b/google_api_availability/example/android/app/src/debug/AndroidManifest.xml new file mode 100644 index 0000000..399f698 --- /dev/null +++ b/google_api_availability/example/android/app/src/debug/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/google_api_availability/example/android/app/src/main/AndroidManifest.xml b/google_api_availability/example/android/app/src/main/AndroidManifest.xml index c887de4..fb53f6a 100644 --- a/google_api_availability/example/android/app/src/main/AndroidManifest.xml +++ b/google_api_availability/example/android/app/src/main/AndroidManifest.xml @@ -1,40 +1,45 @@ - - - + + android:name="${applicationName}" + android:icon="@mipmap/ic_launcher"> - - + + android:name="io.flutter.embedding.android.NormalTheme" + android:resource="@style/NormalTheme" + /> - - + + - - - + + + + + + + + + diff --git a/google_api_availability/example/android/app/src/main/java/com/baseflow/googleapiavailabilityexample/MainActivity.java b/google_api_availability/example/android/app/src/main/java/com/baseflow/googleapiavailabilityexample/MainActivity.java new file mode 100644 index 0000000..0283b74 --- /dev/null +++ b/google_api_availability/example/android/app/src/main/java/com/baseflow/googleapiavailabilityexample/MainActivity.java @@ -0,0 +1,6 @@ +package com.baseflow.googleapiavailabilityexample; + +import io.flutter.embedding.android.FlutterActivity; + +public class MainActivity extends FlutterActivity { +} diff --git a/google_api_availability/example/android/app/src/main/res/drawable-v21/launch_background.xml b/google_api_availability/example/android/app/src/main/res/drawable-v21/launch_background.xml new file mode 100644 index 0000000..f74085f --- /dev/null +++ b/google_api_availability/example/android/app/src/main/res/drawable-v21/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/google_api_availability/example/android/app/src/main/res/values-night/styles.xml b/google_api_availability/example/android/app/src/main/res/values-night/styles.xml new file mode 100644 index 0000000..06952be --- /dev/null +++ b/google_api_availability/example/android/app/src/main/res/values-night/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/google_api_availability/example/android/app/src/main/res/values/styles.xml b/google_api_availability/example/android/app/src/main/res/values/styles.xml index 00fa441..cb1ef88 100644 --- a/google_api_availability/example/android/app/src/main/res/values/styles.xml +++ b/google_api_availability/example/android/app/src/main/res/values/styles.xml @@ -1,8 +1,18 @@ - + + diff --git a/google_api_availability/example/android/app/src/profile/AndroidManifest.xml b/google_api_availability/example/android/app/src/profile/AndroidManifest.xml new file mode 100644 index 0000000..399f698 --- /dev/null +++ b/google_api_availability/example/android/app/src/profile/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/google_api_availability/example/android/build.gradle b/google_api_availability/example/android/build.gradle deleted file mode 100644 index bc157bd..0000000 --- a/google_api_availability/example/android/build.gradle +++ /dev/null @@ -1,18 +0,0 @@ -allprojects { - repositories { - google() - mavenCentral() - } -} - -rootProject.buildDir = '../build' -subprojects { - project.buildDir = "${rootProject.buildDir}/${project.name}" -} -subprojects { - project.evaluationDependsOn(':app') -} - -tasks.register("clean", Delete) { - delete rootProject.buildDir -} diff --git a/google_api_availability/example/android/build.gradle.kts b/google_api_availability/example/android/build.gradle.kts new file mode 100644 index 0000000..dbee657 --- /dev/null +++ b/google_api_availability/example/android/build.gradle.kts @@ -0,0 +1,24 @@ +allprojects { + repositories { + google() + mavenCentral() + } +} + +val newBuildDir: Directory = + rootProject.layout.buildDirectory + .dir("../../build") + .get() +rootProject.layout.buildDirectory.value(newBuildDir) + +subprojects { + val newSubprojectBuildDir: Directory = newBuildDir.dir(project.name) + project.layout.buildDirectory.value(newSubprojectBuildDir) +} +subprojects { + project.evaluationDependsOn(":app") +} + +tasks.register("clean") { + delete(rootProject.layout.buildDirectory) +} diff --git a/google_api_availability/example/android/gradle.properties b/google_api_availability/example/android/gradle.properties index 75e8721..e96108c 100644 --- a/google_api_availability/example/android/gradle.properties +++ b/google_api_availability/example/android/gradle.properties @@ -1,4 +1,6 @@ -android.enableJetifier=true +org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true -android.enableR8=true -org.gradle.jvmargs=-Xmx1536M \ No newline at end of file +# This newDsl flag was added by the Flutter template +android.newDsl=false +# This builtInKotlin flag was added by the Flutter template +android.builtInKotlin=false diff --git a/google_api_availability/example/android/gradle/wrapper/gradle-wrapper.properties b/google_api_availability/example/android/gradle/wrapper/gradle-wrapper.properties index 79be7df..a20f2c4 100644 --- a/google_api_availability/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/google_api_availability/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Wed Apr 01 07:57:11 BST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-all.zip diff --git a/google_api_availability/example/android/settings.gradle b/google_api_availability/example/android/settings.gradle deleted file mode 100644 index dd6cb53..0000000 --- a/google_api_availability/example/android/settings.gradle +++ /dev/null @@ -1,24 +0,0 @@ -pluginManagement { - def flutterSdkPath = { - def properties = new Properties() - file("local.properties").withInputStream { properties.load(it) } - def flutterSdkPath = properties.getProperty("flutter.sdk") - assert flutterSdkPath != null, "flutter.sdk not set in local.properties" - return flutterSdkPath - }() - - includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") - - repositories { - google() - mavenCentral() - gradlePluginPortal() - } - } - - plugins { - id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.7.0" apply false - } - - include ":app" \ No newline at end of file diff --git a/google_api_availability/example/android/settings.gradle.kts b/google_api_availability/example/android/settings.gradle.kts new file mode 100644 index 0000000..b28021a --- /dev/null +++ b/google_api_availability/example/android/settings.gradle.kts @@ -0,0 +1,26 @@ +pluginManagement { + val flutterSdkPath = + run { + val properties = java.util.Properties() + file("local.properties").inputStream().use { properties.load(it) } + val flutterSdkPath = properties.getProperty("flutter.sdk") + require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" } + flutterSdkPath + } + + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") + + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} + +plugins { + id("dev.flutter.flutter-plugin-loader") version "1.0.0" + id("com.android.application") version "9.1.0" apply false + id("org.jetbrains.kotlin.android") version "2.4.0" apply false +} + +include(":app") diff --git a/google_api_availability/pubspec.yaml b/google_api_availability/pubspec.yaml index 2c47612..08430c6 100644 --- a/google_api_availability/pubspec.yaml +++ b/google_api_availability/pubspec.yaml @@ -1,11 +1,11 @@ name: google_api_availability description: A Flutter plugin to check the availability of Google Play Services on an Android device. -version: 5.0.1 +version: 5.1.0 homepage: https://github.com/baseflowit/flutter-google-api-availability environment: sdk: ^3.5.0 - flutter: ">=2.8.1" + flutter: ">=3.24.0" dependencies: flutter: diff --git a/google_api_availability_android/CHANGELOG.md b/google_api_availability_android/CHANGELOG.md index a82a02a..318c923 100644 --- a/google_api_availability_android/CHANGELOG.md +++ b/google_api_availability_android/CHANGELOG.md @@ -1,3 +1,10 @@ +## 1.2.0 + +* Updates the minimum supported Flutter version to 3.24, matching the Dart 3.5 + SDK constraint. +* Migrates the Gradle build to the Kotlin DSL, Android Gradle Plugin 9.1, + compile SDK 36 and Java 17. + ## 1.1.1 * Updates gradle version from 8.1.0 to 8.10.2 diff --git a/google_api_availability_android/analysis_options.yaml b/google_api_availability_android/analysis_options.yaml index fbe6296..7c76568 100644 --- a/google_api_availability_android/analysis_options.yaml +++ b/google_api_availability_android/analysis_options.yaml @@ -5,6 +5,8 @@ analyzer: # Ignore generated files - '**/*.g.dart' - 'lib/src/generated/*.dart' + - build/** + - android/** linter: rules: - public_member_api_docs diff --git a/google_api_availability_android/android/.gitignore b/google_api_availability_android/android/.gitignore new file mode 100644 index 0000000..161bdcd --- /dev/null +++ b/google_api_availability_android/android/.gitignore @@ -0,0 +1,9 @@ +*.iml +.gradle +/local.properties +/.idea/workspace.xml +/.idea/libraries +.DS_Store +/build +/captures +.cxx diff --git a/google_api_availability_android/android/build.gradle b/google_api_availability_android/android/build.gradle deleted file mode 100644 index 8cb6142..0000000 --- a/google_api_availability_android/android/build.gradle +++ /dev/null @@ -1,38 +0,0 @@ -group 'com.baseflow.googleapiavailability' -version '1.0-SNAPSHOT' - -rootProject.allprojects { - repositories { - google() - mavenCentral() - } -} - -apply plugin: 'com.android.library' - -android { - // Conditional for compatibility with AGP <4.2. - if (project.android.hasProperty("namespace")) { - namespace 'com.baseflow.googleapiavailability' - } - - compileSdkVersion 35 - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - - defaultConfig { - minSdkVersion 16 - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - } - lintOptions { - disable 'InvalidPackage' - } -} - -dependencies { - implementation 'com.google.android.gms:play-services-base:18.1.0' - implementation 'androidx.annotation:annotation:1.1.0' -} diff --git a/google_api_availability_android/android/build.gradle.kts b/google_api_availability_android/android/build.gradle.kts new file mode 100644 index 0000000..1bb5192 --- /dev/null +++ b/google_api_availability_android/android/build.gradle.kts @@ -0,0 +1,48 @@ +group = "com.baseflow.googleapiavailability" +version = "1.0" + +buildscript { + repositories { + google() + mavenCentral() + } + + dependencies { + classpath("com.android.tools.build:gradle:9.1.0") + } +} + +allprojects { + repositories { + google() + mavenCentral() + } +} + +plugins { + id("com.android.library") +} + +android { + namespace = "com.baseflow.googleapiavailability" + + compileSdk = 36 + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + + defaultConfig { + minSdk = 16 + } + + lint { + disable.add("InvalidPackage") + } +} + +dependencies { + implementation("com.google.android.gms:play-services-base:18.1.0") + implementation("androidx.annotation:annotation:1.1.0") +} diff --git a/google_api_availability_android/android/gradle/wrapper/gradle-wrapper.properties b/google_api_availability_android/android/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 1e2fbf0..0000000 --- a/google_api_availability_android/android/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/google_api_availability_android/android/settings.gradle b/google_api_availability_android/android/settings.gradle deleted file mode 100644 index f1edea9..0000000 --- a/google_api_availability_android/android/settings.gradle +++ /dev/null @@ -1,25 +0,0 @@ -pluginManagement { - def flutterSdkPath = { - def properties = new Properties() - file("local.properties").withInputStream { properties.load(it) } - def flutterSdkPath = properties.getProperty("flutter.sdk") - assert flutterSdkPath != null, "flutter.sdk not set in local.properties" - return flutterSdkPath - }() - - includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") - - repositories { - google() - mavenCentral() - gradlePluginPortal() - } - } - -plugins { - id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.7.0" apply false -} - - include ":app" - \ No newline at end of file diff --git a/google_api_availability_android/android/settings.gradle.kts b/google_api_availability_android/android/settings.gradle.kts new file mode 100644 index 0000000..c69956d --- /dev/null +++ b/google_api_availability_android/android/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "google_api_availability_android" diff --git a/google_api_availability_android/android/src/main/AndroidManifest.xml b/google_api_availability_android/android/src/main/AndroidManifest.xml index fd45006..a2f47b6 100644 --- a/google_api_availability_android/android/src/main/AndroidManifest.xml +++ b/google_api_availability_android/android/src/main/AndroidManifest.xml @@ -1,3 +1,2 @@ - + diff --git a/google_api_availability_android/example/android/.gitignore b/google_api_availability_android/example/android/.gitignore index 65b7315..be3943c 100644 --- a/google_api_availability_android/example/android/.gitignore +++ b/google_api_availability_android/example/android/.gitignore @@ -1,10 +1,14 @@ -*.iml -*.class -.gradle +gradle-wrapper.jar +/.gradle +/captures/ +/gradlew +/gradlew.bat /local.properties -/.idea/workspace.xml -/.idea/libraries -.DS_Store -/build -/captures GeneratedPluginRegistrant.java +.cxx/ + +# Remember to never publicly share your keystore. +# See https://flutter.dev/to/reference-keystore +key.properties +**/*.keystore +**/*.jks diff --git a/google_api_availability_android/example/android/.settings/org.eclipse.buildship.core.prefs b/google_api_availability_android/example/android/.settings/org.eclipse.buildship.core.prefs deleted file mode 100644 index 9851512..0000000 --- a/google_api_availability_android/example/android/.settings/org.eclipse.buildship.core.prefs +++ /dev/null @@ -1,13 +0,0 @@ -arguments= -auto.sync=false -build.scans.enabled=false -connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER) -connection.project.dir= -eclipse.preferences.version=1 -gradle.user.home= -java.home=/Library/Java/JavaVirtualMachines/adoptopenjdk-11.jdk/Contents/Home -jvm.arguments= -offline.mode=false -override.workspace.settings=true -show.console.view=true -show.executions.view=true diff --git a/google_api_availability_android/example/android/app/.classpath b/google_api_availability_android/example/android/app/.classpath deleted file mode 100644 index eb19361..0000000 --- a/google_api_availability_android/example/android/app/.classpath +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/google_api_availability_android/example/android/app/.settings/org.eclipse.buildship.core.prefs b/google_api_availability_android/example/android/app/.settings/org.eclipse.buildship.core.prefs deleted file mode 100644 index b1886ad..0000000 --- a/google_api_availability_android/example/android/app/.settings/org.eclipse.buildship.core.prefs +++ /dev/null @@ -1,2 +0,0 @@ -connection.project.dir=.. -eclipse.preferences.version=1 diff --git a/google_api_availability_android/example/android/app/build.gradle b/google_api_availability_android/example/android/app/build.gradle deleted file mode 100644 index b466482..0000000 --- a/google_api_availability_android/example/android/app/build.gradle +++ /dev/null @@ -1,64 +0,0 @@ -plugins { - id "com.android.application" - id "dev.flutter.flutter-gradle-plugin" -} - -def localProperties = new Properties() -def localPropertiesFile = rootProject.file('local.properties') -if (localPropertiesFile.exists()) { - localPropertiesFile.withReader('UTF-8') { reader -> - localProperties.load(reader) - } -} - -def flutterVersionCode = localProperties.getProperty('flutter.versionCode') -if (flutterVersionCode == null) { - flutterVersionCode = '1' -} - -def flutterVersionName = localProperties.getProperty('flutter.versionName') -if (flutterVersionName == null) { - flutterVersionName = '1.0' -} - -android { - namespace 'com.baseflow.googleapiavailabilityexample' - compileSdkVersion flutter.compileSdkVersion - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - - lintOptions { - disable 'InvalidPackage' - } - - defaultConfig { - // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "com.baseflow.googleapiavailabilityexample" - minSdkVersion flutter.minSdkVersion - targetSdkVersion flutter.targetSdkVersion - versionCode flutterVersionCode.toInteger() - versionName flutterVersionName - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - } - - buildTypes { - release { - // TODO: Add your own signing config for the release build. - // Signing with the debug keys for now, so `flutter run --release` works. - signingConfig signingConfigs.debug - } - } -} - -flutter { - source '../..' -} - -dependencies { - androidTestImplementation 'androidx.test:runner:1.2.0' - androidTestImplementation 'androidx.test:rules:1.2.0' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' -} \ No newline at end of file diff --git a/google_api_availability_android/example/android/app/build.gradle.kts b/google_api_availability_android/example/android/app/build.gradle.kts new file mode 100644 index 0000000..fe15785 --- /dev/null +++ b/google_api_availability_android/example/android/app/build.gradle.kts @@ -0,0 +1,49 @@ +plugins { + id("com.android.application") + // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. + id("dev.flutter.flutter-gradle-plugin") +} + +android { + namespace = "com.baseflow.googleapiavailabilityexample" + compileSdk = flutter.compileSdkVersion + ndkVersion = flutter.ndkVersion + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + + defaultConfig { + // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). + applicationId = "com.baseflow.googleapiavailabilityexample" + // You can update the following values to match your application needs. + // For more information, see: https://flutter.dev/to/review-gradle-config. + minSdk = flutter.minSdkVersion + targetSdk = flutter.targetSdkVersion + // Uses the version code from pubspec.yaml. When using split APKs, 1000 * ABI_VERSION + // is added automatically by Flutter. (https://developer.android.com/studio/build/configure-apk-splits#configure-APK-versions) + // You can force using the value of versionCode by specifying the `-P force-version-code-ignoring-abi=true` + // flag during build. + versionCode = flutter.versionCode + versionName = flutter.versionName + } + + buildTypes { + release { + // TODO: Add your own signing config for the release build. + // Signing with the debug keys for now, so `flutter run --release` works. + signingConfig = signingConfigs.getByName("debug") + } + } +} + +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} + +flutter { + source = "../.." +} diff --git a/google_api_availability_android/example/android/app/src/debug/AndroidManifest.xml b/google_api_availability_android/example/android/app/src/debug/AndroidManifest.xml new file mode 100644 index 0000000..399f698 --- /dev/null +++ b/google_api_availability_android/example/android/app/src/debug/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/google_api_availability_android/example/android/app/src/main/AndroidManifest.xml b/google_api_availability_android/example/android/app/src/main/AndroidManifest.xml index c887de4..fb53f6a 100644 --- a/google_api_availability_android/example/android/app/src/main/AndroidManifest.xml +++ b/google_api_availability_android/example/android/app/src/main/AndroidManifest.xml @@ -1,40 +1,45 @@ - - - + + android:name="${applicationName}" + android:icon="@mipmap/ic_launcher"> - - + + android:name="io.flutter.embedding.android.NormalTheme" + android:resource="@style/NormalTheme" + /> - - + + - - - + + + + + + + + + diff --git a/google_api_availability_android/example/android/app/src/main/java/com/baseflow/googleapiavailabilityexample/MainActivity.java b/google_api_availability_android/example/android/app/src/main/java/com/baseflow/googleapiavailabilityexample/MainActivity.java new file mode 100644 index 0000000..0283b74 --- /dev/null +++ b/google_api_availability_android/example/android/app/src/main/java/com/baseflow/googleapiavailabilityexample/MainActivity.java @@ -0,0 +1,6 @@ +package com.baseflow.googleapiavailabilityexample; + +import io.flutter.embedding.android.FlutterActivity; + +public class MainActivity extends FlutterActivity { +} diff --git a/google_api_availability_android/example/android/app/src/main/res/drawable-v21/launch_background.xml b/google_api_availability_android/example/android/app/src/main/res/drawable-v21/launch_background.xml new file mode 100644 index 0000000..f74085f --- /dev/null +++ b/google_api_availability_android/example/android/app/src/main/res/drawable-v21/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/google_api_availability_android/example/android/app/src/main/res/values-night/styles.xml b/google_api_availability_android/example/android/app/src/main/res/values-night/styles.xml new file mode 100644 index 0000000..06952be --- /dev/null +++ b/google_api_availability_android/example/android/app/src/main/res/values-night/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/google_api_availability_android/example/android/app/src/main/res/values/styles.xml b/google_api_availability_android/example/android/app/src/main/res/values/styles.xml index 00fa441..cb1ef88 100644 --- a/google_api_availability_android/example/android/app/src/main/res/values/styles.xml +++ b/google_api_availability_android/example/android/app/src/main/res/values/styles.xml @@ -1,8 +1,18 @@ - + + diff --git a/google_api_availability_android/example/android/app/src/profile/AndroidManifest.xml b/google_api_availability_android/example/android/app/src/profile/AndroidManifest.xml new file mode 100644 index 0000000..399f698 --- /dev/null +++ b/google_api_availability_android/example/android/app/src/profile/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/google_api_availability_android/example/android/build.gradle b/google_api_availability_android/example/android/build.gradle deleted file mode 100644 index bc157bd..0000000 --- a/google_api_availability_android/example/android/build.gradle +++ /dev/null @@ -1,18 +0,0 @@ -allprojects { - repositories { - google() - mavenCentral() - } -} - -rootProject.buildDir = '../build' -subprojects { - project.buildDir = "${rootProject.buildDir}/${project.name}" -} -subprojects { - project.evaluationDependsOn(':app') -} - -tasks.register("clean", Delete) { - delete rootProject.buildDir -} diff --git a/google_api_availability_android/example/android/build.gradle.kts b/google_api_availability_android/example/android/build.gradle.kts new file mode 100644 index 0000000..dbee657 --- /dev/null +++ b/google_api_availability_android/example/android/build.gradle.kts @@ -0,0 +1,24 @@ +allprojects { + repositories { + google() + mavenCentral() + } +} + +val newBuildDir: Directory = + rootProject.layout.buildDirectory + .dir("../../build") + .get() +rootProject.layout.buildDirectory.value(newBuildDir) + +subprojects { + val newSubprojectBuildDir: Directory = newBuildDir.dir(project.name) + project.layout.buildDirectory.value(newSubprojectBuildDir) +} +subprojects { + project.evaluationDependsOn(":app") +} + +tasks.register("clean") { + delete(rootProject.layout.buildDirectory) +} diff --git a/google_api_availability_android/example/android/gradle.properties b/google_api_availability_android/example/android/gradle.properties index 75e8721..e96108c 100644 --- a/google_api_availability_android/example/android/gradle.properties +++ b/google_api_availability_android/example/android/gradle.properties @@ -1,4 +1,6 @@ -android.enableJetifier=true +org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true -android.enableR8=true -org.gradle.jvmargs=-Xmx1536M \ No newline at end of file +# This newDsl flag was added by the Flutter template +android.newDsl=false +# This builtInKotlin flag was added by the Flutter template +android.builtInKotlin=false diff --git a/google_api_availability_android/example/android/gradle/wrapper/gradle-wrapper.properties b/google_api_availability_android/example/android/gradle/wrapper/gradle-wrapper.properties index 79be7df..a20f2c4 100644 --- a/google_api_availability_android/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/google_api_availability_android/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Wed Apr 01 07:57:11 BST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-all.zip diff --git a/google_api_availability_android/example/android/settings.gradle b/google_api_availability_android/example/android/settings.gradle deleted file mode 100644 index eba33e6..0000000 --- a/google_api_availability_android/example/android/settings.gradle +++ /dev/null @@ -1,25 +0,0 @@ -pluginManagement { - def flutterSdkPath = { - def properties = new Properties() - file("local.properties").withInputStream { properties.load(it) } - def flutterSdkPath = properties.getProperty("flutter.sdk") - assert flutterSdkPath != null, "flutter.sdk not set in local.properties" - return flutterSdkPath - }() - - includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") - - repositories { - google() - mavenCentral() - gradlePluginPortal() - } - } - - plugins { - id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.7.0" apply false - } - - include ":app" - \ No newline at end of file diff --git a/google_api_availability_android/example/android/settings.gradle.kts b/google_api_availability_android/example/android/settings.gradle.kts new file mode 100644 index 0000000..b28021a --- /dev/null +++ b/google_api_availability_android/example/android/settings.gradle.kts @@ -0,0 +1,26 @@ +pluginManagement { + val flutterSdkPath = + run { + val properties = java.util.Properties() + file("local.properties").inputStream().use { properties.load(it) } + val flutterSdkPath = properties.getProperty("flutter.sdk") + require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" } + flutterSdkPath + } + + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") + + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} + +plugins { + id("dev.flutter.flutter-plugin-loader") version "1.0.0" + id("com.android.application") version "9.1.0" apply false + id("org.jetbrains.kotlin.android") version "2.4.0" apply false +} + +include(":app") diff --git a/google_api_availability_android/pubspec.yaml b/google_api_availability_android/pubspec.yaml index f4f8246..840da1d 100644 --- a/google_api_availability_android/pubspec.yaml +++ b/google_api_availability_android/pubspec.yaml @@ -3,7 +3,7 @@ description: An Android implementation for the google_api_availability plugin. repository: https://github.com/baseflow/flutter-google-api-availability/tree/main/google_api_availability_android # NOTE: We strongly prefer non-breaking changes, even at the expense of a # less-clean API. See https://flutter.dev/go/platform-interface-breaking-changes -version: 1.1.1 +version: 1.2.0 flutter: plugin: @@ -27,4 +27,4 @@ dev_dependencies: environment: sdk: ^3.5.0 - flutter: ">=2.8.0" + flutter: ">=3.24.0" diff --git a/google_api_availability_platform_interface/CHANGELOG.md b/google_api_availability_platform_interface/CHANGELOG.md index 37bead1..848605d 100644 --- a/google_api_availability_platform_interface/CHANGELOG.md +++ b/google_api_availability_platform_interface/CHANGELOG.md @@ -1,6 +1,8 @@ -## next +## 1.1.0 * Fixed publishing warning and updated Dart SDK dependency from '>=2.15.0 <3.0.0' to '^3.5.0'. +* Updates the minimum supported Flutter version to 3.24, matching the Dart 3.5 + SDK constraint. ## 1.0.1 diff --git a/google_api_availability_platform_interface/analysis_options.yaml b/google_api_availability_platform_interface/analysis_options.yaml index fbe6296..68d3db8 100644 --- a/google_api_availability_platform_interface/analysis_options.yaml +++ b/google_api_availability_platform_interface/analysis_options.yaml @@ -5,6 +5,7 @@ analyzer: # Ignore generated files - '**/*.g.dart' - 'lib/src/generated/*.dart' + - build/** linter: rules: - public_member_api_docs diff --git a/google_api_availability_platform_interface/pubspec.yaml b/google_api_availability_platform_interface/pubspec.yaml index 95c0b72..6792667 100644 --- a/google_api_availability_platform_interface/pubspec.yaml +++ b/google_api_availability_platform_interface/pubspec.yaml @@ -3,7 +3,7 @@ description: A common platform interface for the google_api_availability plugin. repository: https://github.com/baseflow/flutter-google-api-availability/tree/main/google_api_availability_platform_interface # NOTE: We strongly prefer non-breaking changes, even at the expense of a # less-clean API. See https://flutter.dev/go/platform-interface-breaking-changes -version: 1.0.1 +version: 1.1.0 dependencies: flutter: @@ -19,4 +19,4 @@ dev_dependencies: environment: sdk: ^3.5.0 - flutter: ">=2.8.0" + flutter: ">=3.24.0"