Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
6a2fbbd
added Android federated plugin
Feb 8, 2022
825106e
ios plugin
Feb 8, 2022
556e743
ios example app files
Feb 9, 2022
558a805
ios README and pubspec
Feb 9, 2022
8b2dd48
mirgrated unit tests
Feb 9, 2022
c805e4e
removes unneeded files and updates ci config
Feb 9, 2022
b41a476
lint fix
Feb 9, 2022
be01c76
fixed types and amplify_flutter_example dependency
Feb 9, 2022
af32c8b
handling plugin structure in unit test bash script
Feb 9, 2022
cf64d91
added android example app, updated unit test bash script
Feb 10, 2022
253d828
unit test fix
Feb 10, 2022
f9d120a
reverts bash change
Feb 10, 2022
d9f9b16
chaged ios unit test directory
Feb 10, 2022
64d1c65
updated android test resource path
Feb 10, 2022
5c68dd7
fixed ios unit test name in podfile
Feb 10, 2022
b57b8f6
fixed ios tests
Feb 10, 2022
7139497
updated analysis options
Feb 10, 2022
3671978
try parallelism
Feb 10, 2022
68ae995
removed parallelism
Feb 10, 2022
1972615
fixed config
Feb 10, 2022
a4c0318
test api and auth
Feb 11, 2022
6357e40
passes variable to melos script
Feb 14, 2022
0a8aeca
re-consolidating melos commands
Feb 14, 2022
3fc8c93
seperate build commands
Feb 14, 2022
361d845
split out linting
Feb 14, 2022
5be9807
one line script for platform tests
Feb 15, 2022
5f6890c
split up ios linting
Feb 15, 2022
52afbf9
updated ios casing
Feb 15, 2022
b75450e
cleanup
Feb 15, 2022
5ced05f
removed skipped plugins variable
Feb 15, 2022
bccfa3a
handle all plugin directories
Feb 15, 2022
6926558
check failed tests
Feb 15, 2022
f5ac1fc
fix broken tests
Feb 15, 2022
f1f0768
rebased and removed old files
Feb 28, 2022
496ef1d
removed example unit test files
Feb 28, 2022
7ce75b1
updated android and ios package versions
Feb 28, 2022
692933a
updating melos for new example apps
Feb 28, 2022
96af22f
cleanup
Feb 28, 2022
2be67eb
cleanup 2
Feb 28, 2022
9029c97
removed jacoco file
Feb 28, 2022
d3ba568
remeoved analysis options
Feb 28, 2022
4a6c51d
remeoved analysis options
Feb 28, 2022
6dce4d9
cleanup 3
Feb 28, 2022
3b4f39a
downgrade compileSDK
Feb 28, 2022
09ec7da
downgraded gradle version in cognito _android example
Mar 1, 2022
4bffd17
removed jacoco file from _android
Mar 1, 2022
21db825
removing dupe test files
Mar 1, 2022
aaf32f8
restructured
Mar 1, 2022
57ab87f
removed melos change
Mar 1, 2022
2bfd5f8
removed pubspec boilerplate
Mar 1, 2022
6294ada
updated analytics example
Mar 1, 2022
4de2763
updated example app pubspecs
Mar 1, 2022
9f96025
removed unit test dependency
Mar 2, 2022
a258c96
replaced pod dependency
Mar 2, 2022
7be28e6
removed core pod from unit_test ios target
Mar 2, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 4 additions & 2 deletions .circleci/test_all_plugins.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,16 @@ test_failure=0
test_suite=$1
plugin=$3
project_root_dir=$2

dummy_file_path=example/lib/amplifyconfiguration.dart
category_dir=$(echo $plugin | cut -d'_' -f 2)

set +e
set -o pipefail

# Check for federated plugin structure
if [ -d "${plugin}_plugin" ]; then
cd "./${plugin}_plugin/" || exit
if [ -d "${category_dir}" ]; then
cd "./${category_dir}/" || exit
else
cd "./$plugin" || exit
fi
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ Podfile.lock
**/test-results/
.test_coverage.dart
.last_build_id
.fvm/

# IDEs
.idea/
Expand Down
Empty file modified build-support/lint_android.sh
100644 → 100755
Empty file.
4 changes: 2 additions & 2 deletions melos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -129,11 +129,11 @@ scripts:

# AUTH
build:examples:ios:amplify_auth_cognito: >
melos exec -c 1 --scope="amplify_auth_cognito_example" --fail-fast -- \
melos exec -c 1 --scope="amplify_auth_cognito_ios_example" --fail-fast -- \
flutter build ios --simulator

build:examples:android:amplify_auth_cognito: >
melos exec -c 1 --scope="amplify_auth_cognito_example" --fail-fast -- \
melos exec -c 1 --scope="amplify_auth_cognito_android_example" --fail-fast -- \
flutter build apk --debug --verbose

# TODO: LINT COGNITO PLUGIN
Expand Down
4 changes: 2 additions & 2 deletions packages/amplify_analytics_pinpoint/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description: Demonstrates how to use the amplify_analytics_pinpoint plugin.
publish_to: "none" # Remove this line if you wish to publish to pub.dev

environment:
sdk: '>=2.12.0 <3.0.0'
sdk: ">=2.12.0 <3.0.0"

dependencies:
amplify_analytics_pinpoint:
Expand All @@ -17,7 +17,7 @@ dependencies:
# the parent directory to use the current plugin's version.
path: ../
amplify_auth_cognito:
path: ../../amplify_auth_cognito
path: ../../auth/amplify_auth_cognito
amplify_flutter:
path: ../../amplify_flutter

Expand Down
2 changes: 1 addition & 1 deletion packages/amplify_api/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ dependencies:
# the parent directory to use the current plugin's version.
path: ../
amplify_auth_cognito:
path: ../../amplify_auth_cognito
path: ../../auth/amplify_auth_cognito
amplify_flutter:
path: ../../amplify_flutter

Expand Down

This file was deleted.

22 changes: 0 additions & 22 deletions packages/amplify_auth_cognito/example/ios/unit_tests/Info.plist

This file was deleted.

This file was deleted.

This file was deleted.

2 changes: 1 addition & 1 deletion packages/amplify_flutter/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ dev_dependencies:
amplify_api:
path: ../../amplify_api
amplify_auth_cognito:
path: ../../amplify_auth_cognito
path: ../../auth/amplify_auth_cognito
amplify_datastore:
path: ../../amplify_datastore
amplify_lints: ^1.0.0
Expand Down
41 changes: 41 additions & 0 deletions packages/auth/amplify_auth_cognito/example/ios/Podfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# Uncomment this line to define a global platform for your project
platform :ios, '13.0'

# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
ENV['COCOAPODS_DISABLE_STATS'] = 'true'

project 'Runner', {
'Debug' => :debug,
'Profile' => :release,
'Release' => :release,
}

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

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

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_install_all_ios_pods File.dirname(File.realpath(__FILE__))
end

post_install do |installer|
installer.pods_project.targets.each do |target|
flutter_additional_ios_build_settings(target)
end
end
Loading