feat(null-safety): migrate to null safety

CHANGELOG.md

@@ -1,10 +1,15 @@
+## 3.0.0
+
+* Null safety and interim gif support.
+
 ## 2.0.2-alpha
 
 * Limited gif support. Gifs are compressed into webp and rendered as of now.
 
 ## 2.0.1
 
-* Update to null safety package dependencies. OCI still needs to migrate code to respect null safety. Additionally fix issue with hero widgets
+* Update to null safety package dependencies. OCI still needs to migrate code to respect null safety. Additionally fix
+ issue with hero widgets
 
 ## 2.0.0
 
@@ -28,7 +33,8 @@
 
 ## 1.0.0-beta
 
-* Prevent unnecessary downloads from happening by caching the image from the original url and resizing it for different sizes.
+* Prevent unnecessary downloads from happening by caching the image from the original url and resizing it for different
+ sizes.
 
 ## 0.1.15
 
@@ -62,25 +68,24 @@
 
 * Fix dependency version breaking change in flutter cache library.
 
-
 ## 0.1.7
 
-
 * Add style fixes
 
 ## 0.1.6
 
-* Add experimental support for streamed downloading via `useHttpStream` flag which further
-reduces the memory footprint.
+* Add experimental support for streamed downloading via `useHttpStream` flag which further reduces the memory footprint.
 
 ## 0.1.5
 
 * Minor lint issues and formatting patched.
 
 ## 0.1.4
+
 * Fixed issue faced while specifying custom width and height.
 
 ## 0.1.3
+
 * Readme updated.
 
 ## 0.1.2

example/ios/Podfile

@@ -10,81 +10,32 @@ 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
- generated_key_values = {}
- skip_line_start_symbols = ["#", "/"]
- File.foreach(file_abs_path) do |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)
- generated_key_values[podname] = podpath
- else
- puts "Invalid plugin specification: #{line}"
- end
+
+ File.foreach(generated_xcode_build_settings_path) do |line|
+ matches = line.match(/FLUTTER_ROOT\=(.*)/)
+ return matches[1].strip if matches
  end
- generated_key_values
+ raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get"
 end
 
+require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
+
+flutter_ios_podfile_setup
+
 target 'Runner' do
  use_frameworks!
  use_modular_headers!
-
- # Flutter Pod
 
- copied_flutter_dir = File.join(__dir__, 'Flutter')
- copied_framework_path = File.join(copied_flutter_dir, 'Flutter.framework')
- copied_podspec_path = File.join(copied_flutter_dir, 'Flutter.podspec')
- unless File.exist?(copied_framework_path) && File.exist?(copied_podspec_path)
- # Copy Flutter.framework and Flutter.podspec to Flutter/ to have something to link against if the xcode backend script has not run yet.
- # That script will copy the correct debug/profile/release version of the framework based on the currently selected Xcode configuration.
- # CocoaPods will not embed the framework on pod install (before any build phases can generate) if the dylib does not exist.
-
- generated_xcode_build_settings_path = File.join(copied_flutter_dir, 'Generated.xcconfig')
- unless File.exist?(generated_xcode_build_settings_path)
- raise "Generated.xcconfig must exist. If you're running pod install manually, make sure flutter pub get is executed first"
- end
- generated_xcode_build_settings = parse_KV_file(generated_xcode_build_settings_path)
- cached_framework_dir = generated_xcode_build_settings['FLUTTER_FRAMEWORK_DIR'];
-
- unless File.exist?(copied_framework_path)
- FileUtils.cp_r(File.join(cached_framework_dir, 'Flutter.framework'), copied_flutter_dir)
- end
- unless File.exist?(copied_podspec_path)
- FileUtils.cp(File.join(cached_framework_dir, 'Flutter.podspec'), copied_flutter_dir)
- end
- end
-
- # Keep pod path relative so it can be checked into Podfile.lock.
- pod 'Flutter', :path => 'Flutter'
-
- # Plugin Pods
-
- # 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')
- plugin_pods = parse_KV_file('../.flutter-plugins')
- plugin_pods.each do |name, path|
- symlink = File.join('.symlinks', 'plugins', name)
- File.symlink(path, symlink)
- pod name, :path => File.join(symlink, 'ios')
- end
+ flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
 end
 
-# Prevent Cocoapods from embedding a second Flutter framework and causing an error with the new Xcode build system.
-install! 'cocoapods', :disable_input_output_paths => true
-
 post_install do |installer|
  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

example/ios/Podfile.lock

@@ -21,25 +21,22 @@ PODS:
  - Mantle/extobjc (2.1.1)
  - path_provider (0.0.1):
  - Flutter
- - path_provider_linux (0.0.1):
- - Flutter
- - path_provider_macos (0.0.1):
- - Flutter
  - SDWebImage/Core (5.5.2)
  - SDWebImageWebPCoder (0.5.0):
  - libwebp (~> 1.0)
  - SDWebImage/Core (~> 5.5)
- - sqflite (0.0.1):
+ - sqflite (0.0.2):
+ - Flutter
+ - FMDB (>= 2.7.5)
+ - url_launcher (0.0.1):
  - Flutter
- - FMDB (~> 2.7.2)
 
 DEPENDENCIES:
  - Flutter (from `Flutter`)
  - flutter_image_compress (from `.symlinks/plugins/flutter_image_compress/ios`)
  - path_provider (from `.symlinks/plugins/path_provider/ios`)
- - path_provider_linux (from `.symlinks/plugins/path_provider_linux/ios`)
- - path_provider_macos (from `.symlinks/plugins/path_provider_macos/ios`)
  - sqflite (from `.symlinks/plugins/sqflite/ios`)
+ - url_launcher (from `.symlinks/plugins/url_launcher/ios`)
 
 SPEC REPOS:
  trunk:
@@ -56,26 +53,23 @@ EXTERNAL SOURCES:
  :path: ".symlinks/plugins/flutter_image_compress/ios"
  path_provider:
  :path: ".symlinks/plugins/path_provider/ios"
- path_provider_linux:
- :path: ".symlinks/plugins/path_provider_linux/ios"
- path_provider_macos:
- :path: ".symlinks/plugins/path_provider_macos/ios"
  sqflite:
  :path: ".symlinks/plugins/sqflite/ios"
+ url_launcher:
+ :path: ".symlinks/plugins/url_launcher/ios"
 
 SPEC CHECKSUMS:
- Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
+ Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c
  flutter_image_compress: 082f8daaf6c1b0c9fe798251c750ef0ecd98d7ae
  FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
  libwebp: 946cb3063cea9236285f7e9a8505d806d30e07f3
  Mantle: 35238ae6f2e2b2d474fa7b67fee82a59fea71915
  path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c
- path_provider_linux: 4d630dc393e1f20364f3e3b4a2ff41d9674a84e4
- path_provider_macos: f760a3c5b04357c380e2fddb6f9db6f3015897e0
  SDWebImage: 4d5c027c935438f341ed33dbac53ff9f479922ca
  SDWebImageWebPCoder: e7ae855f058e3dcae99696920b6a5d134e9dcddf
- sqflite: 4001a31ff81d210346b500c55b17f4d6c7589dd0
+ sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
+ url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef
 
-PODFILE CHECKSUM: 1b66dae606f75376c5f2135a8290850eeb09ae83
+PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c
 
-COCOAPODS: 1.9.1
+COCOAPODS: 1.10.1

example/ios/Runner.xcodeproj/project.pbxproj

@@ -240,9 +240,28 @@
  files = (
  );
  inputPaths = (
+ "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
+ "${BUILT_PRODUCTS_DIR}/FMDB/FMDB.framework",
+ "${BUILT_PRODUCTS_DIR}/Mantle/Mantle.framework",
+ "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
+ "${BUILT_PRODUCTS_DIR}/SDWebImageWebPCoder/SDWebImageWebPCoder.framework",
+ "${BUILT_PRODUCTS_DIR}/flutter_image_compress/flutter_image_compress.framework",
+ "${BUILT_PRODUCTS_DIR}/libwebp/libwebp.framework",
+ "${BUILT_PRODUCTS_DIR}/path_provider/path_provider.framework",
+ "${BUILT_PRODUCTS_DIR}/sqflite/sqflite.framework",
+ "${BUILT_PRODUCTS_DIR}/url_launcher/url_launcher.framework",
  );
  name = "[CP] Embed Pods Frameworks";
  outputPaths = (
+ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FMDB.framework",
+ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Mantle.framework",
+ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
+ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImageWebPCoder.framework",
+ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_image_compress.framework",
+ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libwebp.framework",
+ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider.framework",
+ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqflite.framework",
+ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher.framework",
  );
  runOnlyForDeploymentPostprocessing = 0;
  shellPath = /bin/sh;

example/lib/main.dart

@@ -74,18 +74,18 @@ class HumblerookiePluginExample extends StatelessWidget {
  1,
  );
  }
- return MaterialColor(color.value, swatch);
+ return MaterialColor(color.value, swatch as Map<int, Color>);
  }
 }
 
 /// A Flutter example demonstrating how the [pluginName] plugin could be used
 class AppHome extends StatefulWidget {
  /// Constructs the [AppHome] class
- AppHome({Key key, this.title}) : super(key: key);
+ AppHome({Key? key, this.title}) : super(key: key);
 
  /// The [title] of the application, which is shown in the application's
  /// title bar.
- final String title;
+ final String? title;
 
  @override
  _AppHomeState createState() => _AppHomeState();