Select multiple images and bump dependency versions (#1)

.gitignore

@@ -68,3 +68,6 @@
 !**/ios/**/default.pbxuser
 !**/ios/**/default.perspectivev3
 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
+
+.flutter-plugins-dependencies
+flutter_export_environment.sh

android/app/build.gradle

@@ -25,23 +25,26 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
- compileSdkVersion 28
+ compileSdkVersion 33
 
  lintOptions {
  disable 'InvalidPackage'
  }
 
  defaultConfig {
  applicationId "dnp.study_snap"
- minSdkVersion 16
- targetSdkVersion 28
+ minSdkVersion 21
+ targetSdkVersion 33
  versionCode flutterVersionCode.toInteger()
  versionName flutterVersionName
  testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+ multiDexEnabled true
  }
 
  buildTypes {
  release {
+ minifyEnabled false
+ shrinkResources false
  // 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
@@ -57,6 +60,5 @@ dependencies {
  testImplementation 'junit:junit:4.12'
  androidTestImplementation 'androidx.test:runner:1.1.0-alpha4'
  androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-alpha4'
+ compile 'com.android.support:multidex:1.0.3'
 }
-
-apply plugin: 'com.google.gms.google-services' // Google Play services Gradle plugin

android/app/src/main/AndroidManifest.xml

@@ -7,14 +7,17 @@
  additional functionality it is fine to subclass or reimplement
  FlutterApplication and put your custom class here. -->
  <application
- android:name="io.flutter.app.FlutterApplication"
  android:label="Study Snap"
  android:icon="@mipmap/ic_launcher">
+ <meta-data
+ android:name="flutterEmbedding"
+ android:value="2" />
  <meta-data
  android:name="com.google.android.gms.ads.APPLICATION_ID"
  android:value="ca-app-pub-8543805483173927~1931251623"/>
  <activity
  android:name=".MainActivity"
+ android:exported="true"
  android:launchMode="singleTop"
  android:theme="@style/LaunchTheme"
  android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"

android/app/src/main/java/com/example/study_snap/MainActivity.java

@@ -1,13 +1,6 @@
 package com.example.study_snap;
 
-import android.os.Bundle;
-import io.flutter.app.FlutterActivity;
-import io.flutter.plugins.GeneratedPluginRegistrant;
+import io.flutter.embedding.android.FlutterActivity;
 
 public class MainActivity extends FlutterActivity {
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- GeneratedPluginRegistrant.registerWith(this);
- }
 }

android/build.gradle

@@ -5,8 +5,7 @@ buildscript {
  }
 
  dependencies {
- classpath 'com.android.tools.build:gradle:3.3.2'
- classpath 'com.google.gms:google-services:3.2.1' // Google services plugin
+ classpath 'com.android.tools.build:gradle:3.3.3'
  }
 }
 

android/settings_aar.gradle

@@ -0,0 +1 @@
+include ':app'

ios/Flutter/AppFrameworkInfo.plist

@@ -21,6 +21,6 @@
  <key>CFBundleVersion</key>
  <string>1.0</string>
  <key>MinimumOSVersion</key>
- <string>8.0</string>
+ <string>11.0</string>
 </dict>
 </plist>

ios/Flutter/Flutter.podspec

@@ -0,0 +1,18 @@
+#
+# NOTE: This podspec is NOT to be published. It is only used as a local source!
+# This is a generated file; do not edit or check into version control.
+#
+
+Pod::Spec.new do |s|
+ s.name = 'Flutter'
+ s.version = '1.0.0'
+ s.summary = 'A UI toolkit for beautiful and fast apps.'
+ s.homepage = 'https://flutter.dev'
+ s.license = { :type => 'BSD' }
+ s.author = { 'Flutter Dev Team' => 'flutter-dev@googlegroups.com' }
+ s.source = { :git => 'https://github.com/flutter/engine', :tag => s.version.to_s }
+ s.ios.deployment_target = '11.0'
+ # Framework linking is handled by Flutter tooling, not CocoaPods.
+ # Add a placeholder to satisfy `s.dependency 'Flutter'` plugin podspecs.
+ s.vendored_frameworks = 'path/to/nothing'
+end

ios/Podfile

@@ -1,5 +1,4 @@
-# Uncomment this line to define a global platform for your project
-# platform :ios, '9.0'
+platform :ios, '14.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
@@ -10,62 +9,35 @@ project 'Runner', {
  'Release' => :release,
 }
 
-def parse_KV_file(file, separator='=')
- file_abs_path = File.expand_path(file)
- if !File.exists? file_abs_path
- return [];
+def flutter_root
+ generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__)
+ unless File.exist?(generated_xcode_build_settings_path)
+ raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first"
  end
- pods_ary = []
- skip_line_start_symbols = ["#", "/"]
- File.foreach(file_abs_path) { |line|
- next if skip_line_start_symbols.any? { |symbol| line =~ /^\s*#{symbol}/ }
- plugin = line.split(pattern=separator)
- if plugin.length == 2
- podname = plugin[0].strip()
- path = plugin[1].strip()
- podpath = File.expand_path("#{path}", file_abs_path)
- pods_ary.push({:name => podname, :path => podpath});
- else
- puts "Invalid plugin specification: #{line}"
- end
- }
- return pods_ary
+
+ File.foreach(generated_xcode_build_settings_path) do |line|
+ matches = line.match(/FLUTTER_ROOT\=(.*)/)
+ return matches[1].strip if matches
+ end
+ raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get"
 end
 
-target 'Runner' do
- use_frameworks!
+require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
 
- # Prepare symlinks folder. We use symlinks to avoid having Podfile.lock
- # referring to absolute paths on developers' machines.
- system('rm -rf .symlinks')
- system('mkdir -p .symlinks/plugins')
+flutter_ios_podfile_setup
 
- # Flutter Pods
- generated_xcode_build_settings = parse_KV_file('./Flutter/Generated.xcconfig')
- if generated_xcode_build_settings.empty?
- puts "Generated.xcconfig must exist. If you're running pod install manually, make sure flutter packages get is executed first."
- end
- generated_xcode_build_settings.map { |p|
- if p[:name] == 'FLUTTER_FRAMEWORK_DIR'
- symlink = File.join('.symlinks', 'flutter')
- File.symlink(File.dirname(p[:path]), symlink)
- pod 'Flutter', :path => File.join(symlink, File.basename(p[:path]))
- end
- }
+target 'Runner' do
+ use_frameworks!
+ use_modular_headers!
 
- # Plugin Pods
- plugin_pods = parse_KV_file('../.flutter-plugins')
- plugin_pods.map { |p|
- symlink = File.join('.symlinks', 'plugins', p[:name])
- File.symlink(p[:path], symlink)
- pod p[:name], :path => File.join(symlink, 'ios')
- }
+ flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
 end
 
 post_install do |installer|
+ installer.pods_project.build_configurations.each do |config|
+ config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64"
+ end
  installer.pods_project.targets.each do |target|
- target.build_configurations.each do |config|
- config.build_settings['ENABLE_BITCODE'] = 'NO'
- end
+ flutter_additional_ios_build_settings(target)
  end
 end

ios/Podfile.lock

@@ -1,46 +1,97 @@
 PODS:
  - esys_flutter_share (0.0.1):
  - Flutter
+ - firebase_admob (0.11.2):
+ - Flutter
+ - Google-Mobile-Ads-SDK (= 7.49.0)
  - Flutter (1.0.0)
  - flutter_native_image (0.0.1):
  - Flutter
+ - Google-Mobile-Ads-SDK (7.49.0):
+ - GoogleAppMeasurement (~> 6.0)
+ - GoogleAppMeasurement (6.9.0):
+ - GoogleUtilities/AppDelegateSwizzler (~> 6.7)
+ - GoogleUtilities/MethodSwizzler (~> 6.7)
+ - GoogleUtilities/Network (~> 6.7)
+ - "GoogleUtilities/NSData+zlib (~> 6.7)"
+ - nanopb (~> 1.30906.0)
+ - GoogleUtilities/AppDelegateSwizzler (6.7.2):
+ - GoogleUtilities/Environment
+ - GoogleUtilities/Logger
+ - GoogleUtilities/Network
+ - GoogleUtilities/Environment (6.7.2):
+ - PromisesObjC (~> 1.2)
+ - GoogleUtilities/Logger (6.7.2):
+ - GoogleUtilities/Environment
+ - GoogleUtilities/MethodSwizzler (6.7.2):
+ - GoogleUtilities/Logger
+ - GoogleUtilities/Network (6.7.2):
+ - GoogleUtilities/Logger
+ - "GoogleUtilities/NSData+zlib"
+ - GoogleUtilities/Reachability
+ - "GoogleUtilities/NSData+zlib (6.7.2)"
+ - GoogleUtilities/Reachability (6.7.2):
+ - GoogleUtilities/Logger
  - image_picker (0.0.1):
  - Flutter
- - path_provider (0.0.1):
+ - nanopb (1.30906.0):
+ - nanopb/decode (= 1.30906.0)
+ - nanopb/encode (= 1.30906.0)
+ - nanopb/decode (1.30906.0)
+ - nanopb/encode (1.30906.0)
+ - path_provider_ios (0.0.1):
  - Flutter
- - shared_preferences (0.0.1):
+ - PromisesObjC (1.2.12)
+ - shared_preferences_ios (0.0.1):
  - Flutter
 
 DEPENDENCIES:
  - esys_flutter_share (from `.symlinks/plugins/esys_flutter_share/ios`)
- - Flutter (from `.symlinks/flutter/ios`)
+ - firebase_admob (from `.symlinks/plugins/firebase_admob/ios`)
+ - Flutter (from `Flutter`)
  - flutter_native_image (from `.symlinks/plugins/flutter_native_image/ios`)
  - image_picker (from `.symlinks/plugins/image_picker/ios`)
- - path_provider (from `.symlinks/plugins/path_provider/ios`)
- - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)
+ - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`)
+ - shared_preferences_ios (from `.symlinks/plugins/shared_preferences_ios/ios`)
+
+SPEC REPOS:
+ trunk:
+ - Google-Mobile-Ads-SDK
+ - GoogleAppMeasurement
+ - GoogleUtilities
+ - nanopb
+ - PromisesObjC
 
 EXTERNAL SOURCES:
  esys_flutter_share:
  :path: ".symlinks/plugins/esys_flutter_share/ios"
+ firebase_admob:
+ :path: ".symlinks/plugins/firebase_admob/ios"
  Flutter:
- :path: ".symlinks/flutter/ios"
+ :path: Flutter
  flutter_native_image:
  :path: ".symlinks/plugins/flutter_native_image/ios"
  image_picker:
  :path: ".symlinks/plugins/image_picker/ios"
- path_provider:
- :path: ".symlinks/plugins/path_provider/ios"
- shared_preferences:
- :path: ".symlinks/plugins/shared_preferences/ios"
+ path_provider_ios:
+ :path: ".symlinks/plugins/path_provider_ios/ios"
+ shared_preferences_ios:
+ :path: ".symlinks/plugins/shared_preferences_ios/ios"
 
 SPEC CHECKSUMS:
- esys_flutter_share: 403498dab005b36ce1f8d7aff377e81f0621b0b4
- Flutter: 58dd7d1b27887414a370fcccb9e645c08ffd7a6a
+ esys_flutter_share: 07a7bfd83cf0ac3cbbb8ff66d541277aa776d27c
+ firebase_admob: adf6ba6c903591e4db87dcc3aee1ef44cc0243c6
+ Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
  flutter_native_image: 9c0b7451838484458e5b0fae007b86a4c2d4bdfe
- image_picker: a211f28b95a560433c00f5cd3773f4710a20404d
- path_provider: f96fff6166a8867510d2c25fdcc346327cc4b259
- shared_preferences: 1feebfa37bb57264736e16865e7ffae7fc99b523
+ Google-Mobile-Ads-SDK: df315e371b29cf935f7ea872e7bdec39462a100e
+ GoogleAppMeasurement: a6a3a066369828db64eda428cb2856dc1cdc7c4e
+ GoogleUtilities: 7f2f5a07f888cdb145101d6042bc4422f57e70b3
+ image_picker: 0d37d1cb66231c2473a0e3ccb8d062d0c2b3d297
+ nanopb: 59317e09cf1f1a0af72f12af412d54edf52603fc
+ path_provider_ios: 7d7ce634493af4477d156294792024ec3485acd5
+ PromisesObjC: 3113f7f76903778cf4a0586bd1ab89329a0b7b97
+ shared_preferences_ios: aef470a42dc4675a1cdd50e3158b42e3d1232b32
 
-PODFILE CHECKSUM: ebd43b443038e611b86ede96e613bd6033c49497
+PODFILE CHECKSUM: 74f650dea7c2ecca847a62b13628cdcffbfc182d
 
-COCOAPODS: 1.6.1
+COCOAPODS: 1.11.2