Skip to content
This repository was archived by the owner on Jan 20, 2023. It is now read-only.

Commit dce8ba0

Browse files
author
Koen Zwikstra
committed
updates project settings to match most recent flutter template settings
1 parent 2bd2059 commit dce8ba0

20 files changed

+73
-70
lines changed

‎example/.gitignore

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
.DS_Store
2-
.atom/
3-
.idea
4-
.vscode/
2+
.dart_tool/
3+
54
.packages
65
.pub/
6+
77
build/
8-
ios/.generated/
9-
packages
8+
109
.flutter-plugins

‎example/.metadata

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
# This file should be version controlled and should not be manually edited.
55

66
version:
7-
revision: 3ea4d06340a97a1e9d7cae97567c64e0569dcaa2
7+
revision: c7ea3ca377e909469c68f2ab878a5bc53d3cf66b
88
channel: beta

‎example/.vscode/launch.json

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
// Use IntelliSense to learn about possible attributes.
3+
// Hover to view descriptions of existing attributes.
4+
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
5+
"version": "0.2.0",
6+
"configurations": [
7+
{
8+
"name": "Flutter",
9+
"request": "launch",
10+
"type": "dart",
11+
"program": "lib/main.dart"
12+
}
13+
]
14+
}

‎example/android.iml

-12
This file was deleted.

‎example/android/.settings/org.eclipse.buildship.core.prefs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
#Sun Mar 11 21:47:57 CET 2018
21
connection.project.dir=
2+
eclipse.preferences.version=1

‎example/android/app/.settings/org.eclipse.buildship.core.prefs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
#Sun Mar 11 21:47:57 CET 2018
21
connection.project.dir=..
2+
eclipse.preferences.version=1

‎example/android/app/src/main/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
android:name=".MainActivity"
2121
android:launchMode="singleTop"
2222
android:theme="@style/LaunchTheme"
23-
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale"
23+
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density"
2424
android:hardwareAccelerated="true"
2525
android:windowSoftInputMode="adjustResize">
2626
<!-- This keeps the window background of the activity showing

‎example/android/app/src/main/java/com/firstfloorsoftware/fluttersodiumexample/MainActivity.java

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.firstfloorsoftware.fluttersodiumexample;
22

33
import android.os.Bundle;
4-
54
import io.flutter.app.FlutterActivity;
65
import io.flutter.plugins.GeneratedPluginRegistrant;
76

‎example/flutter_sodium_example.iml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module type="WEB_MODULE" version="4">
2+
<module type="JAVA_MODULE" version="4">
33
<component name="NewModuleRootManager" inherit-compiler-output="true">
44
<exclude-output />
55
<content url="file://$MODULE_DIR$">
66
<sourceFolder url="file://$MODULE_DIR$/lib" isTestSource="false" />
77
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
8+
<excludeFolder url="file://$MODULE_DIR$/.dart_tool" />
89
<excludeFolder url="file://$MODULE_DIR$/.idea" />
910
<excludeFolder url="file://$MODULE_DIR$/.pub" />
1011
<excludeFolder url="file://$MODULE_DIR$/build" />

‎example/flutter_sodium_example_android.iml

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<component name="FacetManager">
44
<facet type="android" name="Android">
55
<configuration>
6+
<option name="ALLOW_USER_CONFIGURATION" value="false" />
67
<option name="GEN_FOLDER_RELATIVE_PATH_APT" value="/android/gen" />
78
<option name="GEN_FOLDER_RELATIVE_PATH_AIDL" value="/android/gen" />
89
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/android/AndroidManifest.xml" />

‎example/ios/.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ build/
1212
GeneratedPluginRegistrant.h
1313
GeneratedPluginRegistrant.m
1414

15+
.generated/
16+
1517
*.pbxuser
1618
*.mode1v3
1719
*.mode2v3
@@ -40,3 +42,4 @@ Icon?
4042
/ServiceDefinitions.json
4143

4244
Pods/
45+
.symlinks/

‎example/ios/Flutter/AppFrameworkInfo.plist

-4
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
23-
<key>UIRequiredDeviceCapabilities</key>
24-
<array>
25-
<string>arm64</string>
26-
</array>
2723
<key>MinimumOSVersion</key>
2824
<string>8.0</string>
2925
</dict>

‎example/ios/Podfile.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ EXTERNAL SOURCES:
1515

1616
SPEC CHECKSUMS:
1717
Flutter: 9d0fac939486c9aba2809b7982dfdbb47a7b0296
18-
flutter_sodium: 469272ea82ca2eaae5614eafd619c04ccedb1d6b
18+
flutter_sodium: 78af2a44944ac4f641cc2909090a68ab3476170e
1919

2020
PODFILE CHECKSUM: 5bb5e2b63597cfce9c9fa5786d89ac5632527232
2121

‎example/ios/Runner.xcodeproj/project.pbxproj

+34-32
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
/* Begin PBXBuildFile section */
1010
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
1111
2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */ = {isa = PBXBuildFile; fileRef = 2D5378251FAA1A9400D5DBA9 /* flutter_assets */; };
12-
35CAA0192E027B5BF11666C8 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B1B9E95F31F2C39726E00D52 /* Pods_Runner.framework */; };
1312
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
1413
3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; };
1514
3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1615
74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
16+
952A6DB266032CD858CE2AC4 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 98E7C6236D98599F101023FE /* Pods_Runner.framework */; };
1717
9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; };
1818
9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1919
9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB21CF90195004384FC /* Debug.xcconfig */; };
@@ -55,7 +55,7 @@
5555
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
5656
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
5757
97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
58-
B1B9E95F31F2C39726E00D52 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
58+
98E7C6236D98599F101023FE /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
5959
/* End PBXFileReference section */
6060

6161
/* Begin PBXFrameworksBuildPhase section */
@@ -65,26 +65,26 @@
6565
files = (
6666
9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */,
6767
3B80C3941E831B6300D905FE /* App.framework in Frameworks */,
68-
35CAA0192E027B5BF11666C8 /* Pods_Runner.framework in Frameworks */,
68+
952A6DB266032CD858CE2AC4 /* Pods_Runner.framework in Frameworks */,
6969
);
7070
runOnlyForDeploymentPostprocessing = 0;
7171
};
7272
/* End PBXFrameworksBuildPhase section */
7373

7474
/* Begin PBXGroup section */
75-
064AEA4784359D00314482A8 /* Frameworks */ = {
75+
15E3F1DA08796A428C8AAB25 /* Pods */ = {
7676
isa = PBXGroup;
7777
children = (
78-
B1B9E95F31F2C39726E00D52 /* Pods_Runner.framework */,
7978
);
80-
name = Frameworks;
79+
name = Pods;
8180
sourceTree = "<group>";
8281
};
83-
2409931D19CAD2592A4C209C /* Pods */ = {
82+
881E0298D8C0A57410B2C24A /* Frameworks */ = {
8483
isa = PBXGroup;
8584
children = (
85+
98E7C6236D98599F101023FE /* Pods_Runner.framework */,
8686
);
87-
name = Pods;
87+
name = Frameworks;
8888
sourceTree = "<group>";
8989
};
9090
9740EEB11CF90186004384FC /* Flutter */ = {
@@ -107,8 +107,8 @@
107107
9740EEB11CF90186004384FC /* Flutter */,
108108
97C146F01CF9000F007C117D /* Runner */,
109109
97C146EF1CF9000F007C117D /* Products */,
110-
2409931D19CAD2592A4C209C /* Pods */,
111-
064AEA4784359D00314482A8 /* Frameworks */,
110+
15E3F1DA08796A428C8AAB25 /* Pods */,
111+
881E0298D8C0A57410B2C24A /* Frameworks */,
112112
);
113113
sourceTree = "<group>";
114114
};
@@ -150,14 +150,14 @@
150150
isa = PBXNativeTarget;
151151
buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
152152
buildPhases = (
153-
BDB4BF33C8BCD17B4180358A /* [CP] Check Pods Manifest.lock */,
153+
2688806C4AD98C4D06A2574E /* [CP] Check Pods Manifest.lock */,
154154
9740EEB61CF901F6004384FC /* Run Script */,
155155
97C146EA1CF9000F007C117D /* Sources */,
156156
97C146EB1CF9000F007C117D /* Frameworks */,
157157
97C146EC1CF9000F007C117D /* Resources */,
158158
9705A1C41CF9048500538489 /* Embed Frameworks */,
159159
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
160-
652898EE984C63109B78C503 /* [CP] Embed Pods Frameworks */,
160+
E687EB06060048AA2A54F5B6 /* [CP] Embed Pods Frameworks */,
161161
);
162162
buildRules = (
163163
);
@@ -219,39 +219,37 @@
219219
/* End PBXResourcesBuildPhase section */
220220

221221
/* Begin PBXShellScriptBuildPhase section */
222-
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
222+
2688806C4AD98C4D06A2574E /* [CP] Check Pods Manifest.lock */ = {
223223
isa = PBXShellScriptBuildPhase;
224224
buildActionMask = 2147483647;
225225
files = (
226226
);
227227
inputPaths = (
228+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
229+
"${PODS_ROOT}/Manifest.lock",
228230
);
229-
name = "Thin Binary";
231+
name = "[CP] Check Pods Manifest.lock";
230232
outputPaths = (
233+
"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
231234
);
232235
runOnlyForDeploymentPostprocessing = 0;
233236
shellPath = /bin/sh;
234-
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin";
237+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
238+
showEnvVarsInLog = 0;
235239
};
236-
652898EE984C63109B78C503 /* [CP] Embed Pods Frameworks */ = {
240+
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
237241
isa = PBXShellScriptBuildPhase;
238242
buildActionMask = 2147483647;
239243
files = (
240244
);
241245
inputPaths = (
242-
"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
243-
"${PODS_ROOT}/../.symlinks/flutter/ios/Flutter.framework",
244-
"${BUILT_PRODUCTS_DIR}/flutter_sodium/flutter_sodium.framework",
245246
);
246-
name = "[CP] Embed Pods Frameworks";
247+
name = "Thin Binary";
247248
outputPaths = (
248-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
249-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_sodium.framework",
250249
);
251250
runOnlyForDeploymentPostprocessing = 0;
252251
shellPath = /bin/sh;
253-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
254-
showEnvVarsInLog = 0;
252+
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin";
255253
};
256254
9740EEB61CF901F6004384FC /* Run Script */ = {
257255
isa = PBXShellScriptBuildPhase;
@@ -267,22 +265,24 @@
267265
shellPath = /bin/sh;
268266
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
269267
};
270-
BDB4BF33C8BCD17B4180358A /* [CP] Check Pods Manifest.lock */ = {
268+
E687EB06060048AA2A54F5B6 /* [CP] Embed Pods Frameworks */ = {
271269
isa = PBXShellScriptBuildPhase;
272270
buildActionMask = 2147483647;
273271
files = (
274272
);
275273
inputPaths = (
276-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
277-
"${PODS_ROOT}/Manifest.lock",
274+
"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
275+
"${PODS_ROOT}/../.symlinks/flutter/ios/Flutter.framework",
276+
"${BUILT_PRODUCTS_DIR}/flutter_sodium/flutter_sodium.framework",
278277
);
279-
name = "[CP] Check Pods Manifest.lock";
278+
name = "[CP] Embed Pods Frameworks";
280279
outputPaths = (
281-
"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
280+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
281+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_sodium.framework",
282282
);
283283
runOnlyForDeploymentPostprocessing = 0;
284284
shellPath = /bin/sh;
285-
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
285+
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
286286
showEnvVarsInLog = 0;
287287
};
288288
/* End PBXShellScriptBuildPhase section */
@@ -426,9 +426,9 @@
426426
isa = XCBuildConfiguration;
427427
baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
428428
buildSettings = {
429-
ARCHS = arm64;
430429
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
431430
CLANG_ENABLE_MODULES = YES;
431+
CURRENT_PROJECT_VERSION = 1;
432432
ENABLE_BITCODE = NO;
433433
FRAMEWORK_SEARCH_PATHS = (
434434
"$(inherited)",
@@ -446,16 +446,17 @@
446446
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
447447
SWIFT_SWIFT3_OBJC_INFERENCE = On;
448448
SWIFT_VERSION = 4.0;
449+
VERSIONING_SYSTEM = "apple-generic";
449450
};
450451
name = Debug;
451452
};
452453
97C147071CF9000F007C117D /* Release */ = {
453454
isa = XCBuildConfiguration;
454455
baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
455456
buildSettings = {
456-
ARCHS = arm64;
457457
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
458458
CLANG_ENABLE_MODULES = YES;
459+
CURRENT_PROJECT_VERSION = 1;
459460
ENABLE_BITCODE = NO;
460461
FRAMEWORK_SEARCH_PATHS = (
461462
"$(inherited)",
@@ -472,6 +473,7 @@
472473
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
473474
SWIFT_SWIFT3_OBJC_INFERENCE = On;
474475
SWIFT_VERSION = 4.0;
476+
VERSIONING_SYSTEM = "apple-generic";
475477
};
476478
name = Release;
477479
};

‎example/ios/Runner/Info.plist

-4
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@
2626
<string>LaunchScreen</string>
2727
<key>UIMainStoryboardFile</key>
2828
<string>Main</string>
29-
<key>UIRequiredDeviceCapabilities</key>
30-
<array>
31-
<string>arm64</string>
32-
</array>
3329
<key>UISupportedInterfaceOrientations</key>
3430
<array>
3531
<string>UIInterfaceOrientationPortrait</string>

‎example/pubspec.yaml

+2-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@ description: Demonstrates how to use the flutter_sodium plugin.
44
dependencies:
55
flutter:
66
sdk: flutter
7-
8-
convert: "^2.0.1"
9-
10-
cupertino_icons: ^0.1.0
7+
8+
cupertino_icons: ^0.1.2
119

1210
dev_dependencies:
1311
flutter_test:

‎flutter_sodium.iml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module type="WEB_MODULE" version="4">
2+
<module type="JAVA_MODULE" version="4">
33
<component name="NewModuleRootManager" inherit-compiler-output="true">
44
<exclude-output />
55
<content url="file://$MODULE_DIR$">
66
<sourceFolder url="file://$MODULE_DIR$/lib" isTestSource="false" />
7+
<excludeFolder url="file://$MODULE_DIR$/.dart_tool" />
78
<excludeFolder url="file://$MODULE_DIR$/.idea" />
89
<excludeFolder url="file://$MODULE_DIR$/.pub" />
910
<excludeFolder url="file://$MODULE_DIR$/build" />

‎flutter_sodium_android.iml

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<component name="FacetManager">
44
<facet type="android" name="Android">
55
<configuration>
6+
<option name="ALLOW_USER_CONFIGURATION" value="false" />
67
<option name="GEN_FOLDER_RELATIVE_PATH_APT" value="/android/gen" />
78
<option name="GEN_FOLDER_RELATIVE_PATH_AIDL" value="/android/gen" />
89
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/android/AndroidManifest.xml" />

‎ios/.gitignore

+5
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ profile
99

1010
DerivedData/
1111
build/
12+
GeneratedPluginRegistrant.h
13+
GeneratedPluginRegistrant.m
14+
15+
.generated/
1216

1317
*.pbxuser
1418
*.mode1v3
@@ -29,3 +33,4 @@ xcuserdata
2933
Icon?
3034
.tags*
3135

36+
/Flutter/Generated.xcconfig

‎ios/flutter_sodium.podspec

-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,5 @@ A new flutter plugin project.
1717
s.dependency 'Flutter'
1818
s.vendored_libraries = 'Classes/libsodium-ios/lib/libsodium.a'
1919
s.ios.deployment_target = '8.0'
20-
s.pod_target_xcconfig = { 'SWIFT_VERSION' => '3.2' }
2120
end
2221

0 commit comments

Comments
 (0)