From bb45e3d11401dc26b73f9bd5d15ff40636583165 Mon Sep 17 00:00:00 2001 From: tim Hoogstrate Date: Mon, 26 May 2025 16:02:07 +0200 Subject: [PATCH 1/4] updates geocoding --- geocoding/CHANGELOG.md | 8 +++++ .../org.eclipse.buildship.core.prefs | 6 ++-- geocoding/example/android/app/build.gradle | 14 ++++---- geocoding/example/android/build.gradle | 11 ------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- geocoding/example/android/settings.gradle | 32 ++++++++++++------- .../ios/Flutter/AppFrameworkInfo.plist | 2 +- geocoding/example/ios/Podfile | 2 +- .../ios/Runner.xcodeproj/project.pbxproj | 26 ++++++++++++--- 9 files changed, 63 insertions(+), 40 deletions(-) diff --git a/geocoding/CHANGELOG.md b/geocoding/CHANGELOG.md index e23c975..35825ed 100644 --- a/geocoding/CHANGELOG.md +++ b/geocoding/CHANGELOG.md @@ -1,3 +1,11 @@ +## 4.0.0 + +* **BREAKING CHANGES** Please update to Flutter 3.29+ before updating to this version +* Updates Android CompileSDK to 35 +* Migrates example project to applying Gradle plugins with the declarative plugins block +* Updates kotlin version to soon minimal supported Kotlin version `1.8.10` +* Updates Gradle version to `8.11.1` + ## 3.0.1 - Updated links in README.md to use `https` protocol. diff --git a/geocoding/example/android/.settings/org.eclipse.buildship.core.prefs b/geocoding/example/android/.settings/org.eclipse.buildship.core.prefs index cf2154f..593e50e 100644 --- a/geocoding/example/android/.settings/org.eclipse.buildship.core.prefs +++ b/geocoding/example/android/.settings/org.eclipse.buildship.core.prefs @@ -1,11 +1,11 @@ -arguments= +arguments=--init-script /var/folders/j0/68pctv3d20d6m4jzpy06hj200000gn/T/d146c9752a26f79b52047fb6dc6ed385d064e120494f96f08ca63a317c41f94c.gradle --init-script /var/folders/j0/68pctv3d20d6m4jzpy06hj200000gn/T/52cde0cfcf3e28b8b7510e992210d9614505e0911af0c190bd590d7158574963.gradle auto.sync=false build.scans.enabled=false -connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER) +connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(7.4.2)) connection.project.dir= eclipse.preferences.version=1 gradle.user.home= -java.home=/Users/maurits/Library/Java/JavaVirtualMachines/openjdk-14.0.1/Contents/Home +java.home=/opt/homebrew/Cellar/openjdk/23.0.2/libexec/openjdk.jdk/Contents/Home jvm.arguments= offline.mode=false override.workspace.settings=true diff --git a/geocoding/example/android/app/build.gradle b/geocoding/example/android/app/build.gradle index 357a1f0..62932e5 100644 --- a/geocoding/example/android/app/build.gradle +++ b/geocoding/example/android/app/build.gradle @@ -1,3 +1,9 @@ +plugins { + id "com.android.application" + id "kotlin-android" + id "dev.flutter.flutter-gradle-plugin" +} + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -6,11 +12,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' @@ -21,9 +22,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.geocoding_example" compileSdkVersion flutter.compileSdkVersion diff --git a/geocoding/example/android/build.gradle b/geocoding/example/android/build.gradle index e46749d..bc157bd 100644 --- a/geocoding/example/android/build.gradle +++ b/geocoding/example/android/build.gradle @@ -1,14 +1,3 @@ -buildscript { - repositories { - google() - mavenCentral() - } - - dependencies { - classpath 'com.android.tools.build:gradle:7.3.1' - } -} - allprojects { repositories { google() diff --git a/geocoding/example/android/gradle/wrapper/gradle-wrapper.properties b/geocoding/example/android/gradle/wrapper/gradle-wrapper.properties index 9dbc8ef..2f36bc8 100644 --- a/geocoding/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/geocoding/example/android/gradle/wrapper/gradle-wrapper.properties @@ -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.11.1-all.zip diff --git a/geocoding/example/android/settings.gradle b/geocoding/example/android/settings.gradle index d3b6a40..040936f 100644 --- a/geocoding/example/android/settings.gradle +++ b/geocoding/example/android/settings.gradle @@ -1,15 +1,25 @@ -// Copyright 2014 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +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 + }() -include ':app' + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") -def localPropertiesFile = new File(rootProject.projectDir, "local.properties") -def properties = new Properties() + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} -assert localPropertiesFile.exists() -localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } +plugins { + id "dev.flutter.flutter-plugin-loader" version "1.0.0" // apply true + id "com.android.application" version "8.10.0" apply false + id "org.jetbrains.kotlin.android" version "1.8.0" apply false +} -def flutterSdkPath = properties.getProperty("flutter.sdk") -assert flutterSdkPath != null, "flutter.sdk not set in local.properties" -apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" +include ":app" \ No newline at end of file diff --git a/geocoding/example/ios/Flutter/AppFrameworkInfo.plist b/geocoding/example/ios/Flutter/AppFrameworkInfo.plist index 4f8d4d2..8c6e561 100644 --- a/geocoding/example/ios/Flutter/AppFrameworkInfo.plist +++ b/geocoding/example/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 11.0 + 12.0 diff --git a/geocoding/example/ios/Podfile b/geocoding/example/ios/Podfile index d207307..414ba51 100644 --- a/geocoding/example/ios/Podfile +++ b/geocoding/example/ios/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -# platform :ios, '11.0' +# platform :ios, '12.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/geocoding/example/ios/Runner.xcodeproj/project.pbxproj b/geocoding/example/ios/Runner.xcodeproj/project.pbxproj index c862f78..51384fe 100644 --- a/geocoding/example/ios/Runner.xcodeproj/project.pbxproj +++ b/geocoding/example/ios/Runner.xcodeproj/project.pbxproj @@ -149,6 +149,7 @@ 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, + 6E29543B2DF0160C3EE45A1B /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -165,7 +166,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1430; + LastUpgradeCheck = 1510; ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { @@ -222,6 +223,23 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; + 6E29543B2DF0160C3EE45A1B /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Copy Pods Resources"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; 8DFC6F9C3CE01544A19E06C6 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -335,7 +353,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -417,7 +435,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -466,7 +484,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; From ee95f47a2b30201a0baad6a14415bf2ea3274a4b Mon Sep 17 00:00:00 2001 From: tim Hoogstrate Date: Mon, 26 May 2025 16:10:45 +0200 Subject: [PATCH 2/4] added iOS platform version section to the changelog --- geocoding/CHANGELOG.md | 1 + geocoding/example/android/settings.gradle | 2 +- .../ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/geocoding/CHANGELOG.md b/geocoding/CHANGELOG.md index 35825ed..30a78de 100644 --- a/geocoding/CHANGELOG.md +++ b/geocoding/CHANGELOG.md @@ -5,6 +5,7 @@ * Migrates example project to applying Gradle plugins with the declarative plugins block * Updates kotlin version to soon minimal supported Kotlin version `1.8.10` * Updates Gradle version to `8.11.1` +* Updates iOS Platform verion from `11` to `12` ## 3.0.1 diff --git a/geocoding/example/android/settings.gradle b/geocoding/example/android/settings.gradle index 040936f..030789f 100644 --- a/geocoding/example/android/settings.gradle +++ b/geocoding/example/android/settings.gradle @@ -19,7 +19,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" // apply true id "com.android.application" version "8.10.0" apply false - id "org.jetbrains.kotlin.android" version "1.8.0" apply false + id "org.jetbrains.kotlin.android" version "1.8.10" apply false } include ":app" \ No newline at end of file diff --git a/geocoding/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/geocoding/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index b52b2e6..e67b280 100644 --- a/geocoding/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/geocoding/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ Date: Mon, 26 May 2025 16:21:39 +0200 Subject: [PATCH 3/4] Updates Android dependency to 4.0.0 --- geocoding/CHANGELOG.md | 1 + geocoding/pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/geocoding/CHANGELOG.md b/geocoding/CHANGELOG.md index 30a78de..35b55af 100644 --- a/geocoding/CHANGELOG.md +++ b/geocoding/CHANGELOG.md @@ -6,6 +6,7 @@ * Updates kotlin version to soon minimal supported Kotlin version `1.8.10` * Updates Gradle version to `8.11.1` * Updates iOS Platform verion from `11` to `12` +* Updates `geolocator_android` dependency version from `3.x.x` to `4.x.x` ## 3.0.1 diff --git a/geocoding/pubspec.yaml b/geocoding/pubspec.yaml index 8da09dd..cebe9c4 100644 --- a/geocoding/pubspec.yaml +++ b/geocoding/pubspec.yaml @@ -13,7 +13,7 @@ dependencies: sdk: flutter geocoding_platform_interface: ^3.0.0 - geocoding_android: ^3.0.0 + geocoding_android: ^4.0.0 geocoding_ios: ^3.0.0 dev_dependencies: From ad5bd3286af2be7bbda0997ea682261af58713cf Mon Sep 17 00:00:00 2001 From: TimHoogstrate Date: Wed, 28 May 2025 08:27:52 +0200 Subject: [PATCH 4/4] Update CHANGELOG.md --- geocoding/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/geocoding/CHANGELOG.md b/geocoding/CHANGELOG.md index 35b55af..e0925c8 100644 --- a/geocoding/CHANGELOG.md +++ b/geocoding/CHANGELOG.md @@ -5,7 +5,7 @@ * Migrates example project to applying Gradle plugins with the declarative plugins block * Updates kotlin version to soon minimal supported Kotlin version `1.8.10` * Updates Gradle version to `8.11.1` -* Updates iOS Platform verion from `11` to `12` +* Updates iOS Platform version from `11` to `12` * Updates `geolocator_android` dependency version from `3.x.x` to `4.x.x` ## 3.0.1