Update project config

Update CI config

Author: AliAbdelfattah

.circleci/config.yml

@@ -3,27 +3,30 @@ jobs:
    android_tests:
     working_directory: ~/project/example/android
     macos:
-      xcode: "9.4.0"
+      xcode: "12.3.0"
     environment:
       JVM_OPTS: -Xmx3200m
     steps:
       - checkout:
           path: ~/project
+      - run:
+          name: Install JAVA
+          command: |
+            HOMEBREW_NO_AUTO_UPDATE=1 brew install --cask homebrew/cask-versions/adoptopenjdk8
+      - run:
+          name: Install Android sdk
+          command: |
+            HOMEBREW_NO_AUTO_UPDATE=1 brew install --cask android-sdk
       - run:
           name: Setup environment variables
           command: |
             echo 'export PATH="$PATH:/usr/local/opt/node@8/bin:${HOME}/.yarn/bin:${HOME}/${CIRCLE_PROJECT_REPONAME}/node_modules/.bin:/usr/local/share/android-sdk/tools/bin"' >> $BASH_ENV
+            echo 'export JAVA_HOME=`/usr/libexec/java_home -v 1.8`' >> $BASH_ENV
             echo 'export ANDROID_HOME="/usr/local/share/android-sdk"' >> $BASH_ENV
             echo 'export ANDROID_SDK_HOME="/usr/local/share/android-sdk"' >> $BASH_ENV
             echo 'export ANDROID_SDK_ROOT="/usr/local/share/android-sdk"' >> $BASH_ENV
             echo 'export QEMU_AUDIO_DRV=none' >> $BASH_ENV
-            echo 'export JAVA_HOME=/Library/Java/Home' >> $BASH_ENV
             echo 'export PATH="$PATH:`pwd`/flutter/bin"'  >> $BASH_ENV
-      - run:
-          name: Install Android sdk
-          command: |
-            HOMEBREW_NO_AUTO_UPDATE=1 brew tap homebrew/cask
-            HOMEBREW_NO_AUTO_UPDATE=1 brew cask install android-sdk
       - run:
           name: Install emulator dependencies
           command: (yes | sdkmanager "platform-tools" "platforms;android-26" "extras;intel;Hardware_Accelerated_Execution_Manager" "build-tools;26.0.0" "system-images;android-26;google_apis;x86" "emulator" --verbose) || true
@@ -37,7 +40,7 @@ jobs:
           background: true
       - run:
           name: download flutter SDK
-          command: if ! test -f "flutter_sdk.zip"; then curl -o flutter_sdk.zip https://storage.googleapis.com/flutter_infra/releases/stable/macos/flutter_macos_v1.5.4-hotfix.2-stable.zip; fi
+          command: if ! test -f "flutter_sdk.zip"; then curl -o flutter_sdk.zip https://storage.googleapis.com/flutter_infra/releases/stable/macos/flutter_macos_1.20.4-stable.zip; fi
       - run:
           name: unzip flutter SDK
           command: unzip flutter_sdk.zip
@@ -70,38 +73,36 @@ jobs:
 
    ios_tests:
     macos:
-      xcode: "10.2.0"
-    working_directory: ~/project/example/ios
+      xcode: "12.3.0"
+    working_directory: ~/project/example
     environment:
       FL_OUTPUT_DIR: output
     steps:
       - checkout:
           path: ~/project
+      - run:
+          name: Install CocoaPods
+          command: sudo gem install cocoapods
       - run:
           name: download flutter SDK
-          command: if ! test -f "flutter_sdk.zip"; then curl -o flutter_sdk.zip https://storage.googleapis.com/flutter_infra/releases/stable/macos/flutter_macos_v1.5.4-hotfix.2-stable.zip; fi
+          command: if ! test -f "~/Downloads/flutter_sdk.zip"; then curl -o ~/Downloads/flutter_sdk.zip https://storage.googleapis.com/flutter_infra/releases/stable/macos/flutter_macos_1.20.4-stable.zip; fi
       - run:
           name: unzip flutter SDK
-          command: unzip flutter_sdk.zip
+          command: unzip ~/Downloads/flutter_sdk.zip -d ~/Library
       - run:
           name: export flutter path
-          command: echo 'export PATH="$PATH:`pwd`/flutter/bin"'  >> $BASH_ENV 
-      - run:
-          name: Update Cocoapods
-          command: sudo gem install cocoapods
+          command: echo 'export PATH="$PATH:~/Library/flutter/bin"'  >> $BASH_ENV 
       - run: flutter doctor
+      - run: flutter pub get
+      - run:
+          name: Install Pods
+          command: cd ios && pod install --repo-update
       - run: 
           name: Flutter build
-          command: cd ..; flutter build aot
-      - run:
-          name: Update CocoaPods
-          command: pod update
-      - run:
-          name: Install CocoaPods
-          command: pod install --repo-update
+          command: flutter build aot
       - run:
           name: Build and run tests
-          command:  xcodebuild   -workspace Runner.xcworkspace   -scheme Runner   -sdk iphonesimulator   -destination 'platform=iOS Simulator,name=iPhone X,OS=12.2'   test | xcpretty
+          command: cd ios && xcodebuild  -allowProvisioningUpdates   -workspace Runner.xcworkspace   -scheme Runner   -sdk iphonesimulator   -destination 'platform=iOS Simulator,name=iPhone 12 Pro Max,OS=14.3'   test | xcpretty
 
    release:
     docker:
@@ -113,7 +114,7 @@ jobs:
 
    publish:
     macos:
-      xcode: "10.1.0"
+      xcode: "12.3.0"
     steps:
       - checkout
       - run: git clone https://InstabugCI:[email protected]/Instabug/Escape.git

example/.flutter-plugins-dependencies

@@ -0,0 +1 @@
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"instabug_flutter","path":"/Users/aliabdelfattah/Documents/Dev/Instabug/Dev_Apps/Instabug-Flutter/","dependencies":[]}],"android":[{"name":"instabug_flutter","path":"/Users/aliabdelfattah/Documents/Dev/Instabug/Dev_Apps/Instabug-Flutter/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"instabug_flutter","dependencies":[]}],"date_created":"2021-02-05 23:43:02.556588","version":"1.20.4"}

example/ios/Flutter/.last_build_id

@@ -0,0 +1 @@
+383d0aa192e5769e24f82a9d3297e0f3

example/ios/Flutter/AppFrameworkInfo.plist

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

example/ios/Flutter/flutter_export_environment.sh

@@ -0,0 +1,15 @@
+#!/bin/sh
+# This is a generated file; do not edit or check into version control.
+export "FLUTTER_ROOT=/Users/aliabdelfattah/Library/flutter"
+export "FLUTTER_APPLICATION_PATH=/Users/aliabdelfattah/Documents/Dev/Instabug/Dev_Apps/Instabug-Flutter/example"
+export "FLUTTER_TARGET=lib/main.dart"
+export "FLUTTER_BUILD_DIR=build"
+export "SYMROOT=${SOURCE_ROOT}/../build/ios"
+export "OTHER_LDFLAGS=$(inherited) -framework Flutter"
+export "FLUTTER_FRAMEWORK_DIR=/Users/aliabdelfattah/Library/flutter/bin/cache/artifacts/engine/ios-release"
+export "FLUTTER_BUILD_NAME=1.0.0"
+export "FLUTTER_BUILD_NUMBER=1"
+export "DART_OBFUSCATION=false"
+export "TRACK_WIDGET_CREATION=false"
+export "TREE_SHAKE_ICONS=true"
+export "PACKAGE_CONFIG=.packages"

example/ios/Podfile

@@ -1,5 +1,6 @@
 source 'https://cdn.cocoapods.org/'
 
+# Uncomment this line to define a global platform for your project
 platform :ios, '10.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
@@ -11,90 +12,29 @@ 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
-end
 
-target 'Runner' do
-  # 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 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."
+  File.foreach(generated_xcode_build_settings_path) do |line|
+    matches = line.match(/FLUTTER_ROOT\=(.*)/)
+    return matches[1].strip if matches
   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
-  }
-  
-  # 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')
-  }
+  raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get"
 end
 
-target 'instabug_flutter_exampleUITests' do
-  # 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 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
-  }
-  
-  # 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')
-  }
+require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
+
+flutter_ios_podfile_setup
+
+target 'Runner' do
+  flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
 end
 
 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
-
-pod 'OCMock', '~> 3.4'

example/ios/Podfile.lock

@@ -1,33 +1,29 @@
 PODS:
   - Flutter (1.0.0)
-  - Instabug (9.1.4)
+  - Instabug (9.1.7)
   - instabug_flutter (0.0.1):
     - Flutter
     - Instabug (= 9.1.7)
-  - OCMock (3.8.1)
 
 DEPENDENCIES:
-  - Flutter (from `.symlinks/flutter/ios`)
+  - Flutter (from `Flutter`)
   - instabug_flutter (from `.symlinks/plugins/instabug_flutter/ios`)
-  - OCMock (~> 3.4)
 
 SPEC REPOS:
   trunk:
     - Instabug
-    - OCMock
 
 EXTERNAL SOURCES:
   Flutter:
-    :path: ".symlinks/flutter/ios"
+    :path: Flutter
   instabug_flutter:
     :path: ".symlinks/plugins/instabug_flutter/ios"
 
 SPEC CHECKSUMS:
-  Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
+  Flutter: 446b87ace8a3747a167979213b4aef59a0b5e5fa
   Instabug: 28838c071edc50e4f13800e6877645d3b328aab9
   instabug_flutter: 65794e9f82acebde599e56cc6a2e74a17b69410e
-  OCMock: 29f6e52085b4e7d9b075cbf03ed7c3112f82f934
 
-PODFILE CHECKSUM: 8a47551d4cb50d1be73b4b5bed8629d9a9468757
+PODFILE CHECKSUM: b9ee4d9f65f90936bba6f43025d3b134f174463e
 
 COCOAPODS: 1.10.1