Skip to content

AFP updrates Flutter 3.29.0, removed iOS folder from example project, updated example project #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions .github/workflows/google_api_availability.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,4 @@ jobs:
# Run all unit-tests with code coverage
- name: Run unit tests
run: flutter test --coverage
working-directory: ${{env.source-directory}}

# Upload code coverage information
- uses: codecov/codecov-action@v2
with:
file: ${{env.source-directory}}/coverage/lcov.info # optional
name: Google API Availability (App Facing Package) # optional
fail_ci_if_error: true
working-directory: ${{env.source-directory}}
6 changes: 6 additions & 0 deletions google_api_availability/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## 5.0.1

* Updated example project Gradle build versions.
* Updated Android package to version 1.1.0 (Flutter 3.29.0 support)
* Removed codecov from workflow (ratelimits)

## 5.0.0

* **BREAKING CHANGE**: Removes support for iOS, as it was never truly supported.
Expand Down
13 changes: 5 additions & 8 deletions google_api_availability/example/android/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
plugins {
id "com.android.application"
id "dev.flutter.flutter-gradle-plugin"
}

def localProperties = new Properties()
def localPropertiesFile = rootProject.file('local.properties')
if (localPropertiesFile.exists()) {
Expand All @@ -6,11 +11,6 @@ if (localPropertiesFile.exists()) {
}
}

def flutterRoot = localProperties.getProperty('flutter.sdk')
if (flutterRoot == null) {
throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
}

def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
if (flutterVersionCode == null) {
flutterVersionCode = '1'
Expand All @@ -21,9 +21,6 @@ if (flutterVersionName == null) {
flutterVersionName = '1.0'
}

apply plugin: 'com.android.application'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
namespace 'com.baseflow.googleapiavailabilityexample'
compileSdkVersion flutter.compileSdkVersion
Expand Down

This file was deleted.

11 changes: 0 additions & 11 deletions google_api_availability/example/android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,3 @@
buildscript {
repositories {
google()
mavenCentral()
}

dependencies {
classpath 'com.android.tools.build:gradle:7.3.0'
}
}

allprojects {
repositories {
google()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,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.10.2-all.zip
33 changes: 21 additions & 12 deletions google_api_availability/example/android/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,24 @@
include ':app'
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
}()

def flutterProjectRoot = rootProject.projectDir.parentFile.toPath()
includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")

def plugins = new Properties()
def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins')
if (pluginsFile.exists()) {
pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) }
}
repositories {
google()
mavenCentral()
gradlePluginPortal()
}
}

plugins.each { name, path ->
def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile()
include ":$name"
project(":$name").projectDir = pluginDirectory
}
plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version "8.7.0" apply false
}

include ":app"
45 changes: 0 additions & 45 deletions google_api_availability/example/ios/.gitignore

This file was deleted.

26 changes: 0 additions & 26 deletions google_api_availability/example/ios/Flutter/AppFrameworkInfo.plist

This file was deleted.

5 changes: 0 additions & 5 deletions google_api_availability/example/ios/Flutter/Debug.xcconfig

This file was deleted.

5 changes: 0 additions & 5 deletions google_api_availability/example/ios/Flutter/Release.xcconfig

This file was deleted.

38 changes: 0 additions & 38 deletions google_api_availability/example/ios/Podfile

This file was deleted.

Loading