Skip to content

Commit ce464ab

Browse files
AFP updrates Flutter 3.29.0, removed iOS folder from example project, updated example project (#59)
* removed ios from example folder * updated example project * update * cleanup * update * updated linter * updated gradle settings for example project * updated android package version * updated changelog * removed codecov from workflow
1 parent d1a83c8 commit ce464ab

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+36
-1126
lines changed

.github/workflows/google_api_availability.yaml

+1-8
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,4 @@ jobs:
5757
# Run all unit-tests with code coverage
5858
- name: Run unit tests
5959
run: flutter test --coverage
60-
working-directory: ${{env.source-directory}}
61-
62-
# Upload code coverage information
63-
- uses: codecov/codecov-action@v2
64-
with:
65-
file: ${{env.source-directory}}/coverage/lcov.info # optional
66-
name: Google API Availability (App Facing Package) # optional
67-
fail_ci_if_error: true
60+
working-directory: ${{env.source-directory}}

google_api_availability/CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## 5.0.1
2+
3+
* Updated example project Gradle build versions.
4+
* Updated Android package to version 1.1.0 (Flutter 3.29.0 support)
5+
* Removed codecov from workflow (ratelimits)
6+
17
## 5.0.0
28

39
* **BREAKING CHANGE**: Removes support for iOS, as it was never truly supported.

google_api_availability/example/android/app/build.gradle

+5-8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
plugins {
2+
id "com.android.application"
3+
id "dev.flutter.flutter-gradle-plugin"
4+
}
5+
16
def localProperties = new Properties()
27
def localPropertiesFile = rootProject.file('local.properties')
38
if (localPropertiesFile.exists()) {
@@ -6,11 +11,6 @@ if (localPropertiesFile.exists()) {
611
}
712
}
813

9-
def flutterRoot = localProperties.getProperty('flutter.sdk')
10-
if (flutterRoot == null) {
11-
throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
12-
}
13-
1414
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
1515
if (flutterVersionCode == null) {
1616
flutterVersionCode = '1'
@@ -21,9 +21,6 @@ if (flutterVersionName == null) {
2121
flutterVersionName = '1.0'
2222
}
2323

24-
apply plugin: 'com.android.application'
25-
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
26-
2724
android {
2825
namespace 'com.baseflow.googleapiavailabilityexample'
2926
compileSdkVersion flutter.compileSdkVersion

google_api_availability/example/android/app/src/main/java/com/baseflow/googleapiavailabilityexample/EmbeddingV1Activity.java

-16
This file was deleted.

google_api_availability/example/android/build.gradle

-11
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,3 @@
1-
buildscript {
2-
repositories {
3-
google()
4-
mavenCentral()
5-
}
6-
7-
dependencies {
8-
classpath 'com.android.tools.build:gradle:7.3.0'
9-
}
10-
}
11-
121
allprojects {
132
repositories {
143
google()

google_api_availability/example/android/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,24 @@
1-
include ':app'
1+
pluginManagement {
2+
def flutterSdkPath = {
3+
def properties = new Properties()
4+
file("local.properties").withInputStream { properties.load(it) }
5+
def flutterSdkPath = properties.getProperty("flutter.sdk")
6+
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
7+
return flutterSdkPath
8+
}()
29

3-
def flutterProjectRoot = rootProject.projectDir.parentFile.toPath()
10+
includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
411

5-
def plugins = new Properties()
6-
def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins')
7-
if (pluginsFile.exists()) {
8-
pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) }
9-
}
12+
repositories {
13+
google()
14+
mavenCentral()
15+
gradlePluginPortal()
16+
}
17+
}
1018

11-
plugins.each { name, path ->
12-
def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile()
13-
include ":$name"
14-
project(":$name").projectDir = pluginDirectory
15-
}
19+
plugins {
20+
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
21+
id "com.android.application" version "8.7.0" apply false
22+
}
23+
24+
include ":app"

google_api_availability/example/ios/.gitignore

-45
This file was deleted.

google_api_availability/example/ios/Flutter/AppFrameworkInfo.plist

-26
This file was deleted.

google_api_availability/example/ios/Flutter/Debug.xcconfig

-5
This file was deleted.

google_api_availability/example/ios/Flutter/Release.xcconfig

-5
This file was deleted.

google_api_availability/example/ios/Podfile

-38
This file was deleted.

0 commit comments

Comments
 (0)