Skip to content

Commit 54b3648

Browse files
authored
Merge pull request NGhebreial#18 from zl910627/master
Fix ios build
2 parents f14a4b6 + 1e28b8f commit 54b3648

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+1200
-335
lines changed

.gitignore

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
<<<<<<< HEAD
2+
.DS_Store
3+
.dart_tool/
4+
5+
.packages
6+
.pub/
7+
8+
build/
9+
=======
110
# See https://www.dartlang.org/guides/libraries/private-files
211

312
# Files and directories created by pub
@@ -90,3 +99,4 @@ fabric.properties
9099
# Android studio 3.1+ serialized cache file
91100
.idea/caches/build_file_checksums.ser
92101

102+
>>>>>>> 4d92dc5f90835ff359f6354c50e7a5e4ac764ace

.metadata

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,12 @@
44
# This file should be version controlled and should not be manually edited.
55

66
version:
7+
<<<<<<< HEAD
8+
revision: 20e59316b8b8474554b38493b8ca888794b0234a
9+
channel: stable
10+
=======
711
revision: 5391447fae6209bb21a89e6a5a6583cac1af9b4b
812
channel: beta
13+
>>>>>>> 4d92dc5f90835ff359f6354c50e7a5e4ac764ace
914

1015
project_type: plugin

CHANGELOG.md

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,3 @@
33
* Added iOS code made by @Bhagatcliffex
44

55
## 0.2.4
6-
7-
* Added new method that returns the file without saving it in the gallery
8-
9-
## 0.2.3
10-
11-
* Fixed bug that makes the app crash when deny the permissions
12-
13-
## 0.2.2
14-
15-
* Fixed the way of request the permissions
16-
17-
## 0.2.1
18-
19-
* Fixed bug on permissions
20-
21-
## 0.2.0
22-
23-
* Migrate to AndroidX on android support library.
24-
If you are using the android support library and you want to use that version, you should migrate to Androidx your project.
25-
26-
## 0.1.1
27-
28-
* Some changes on readme.md
29-
30-
## 0.1.0
31-
32-
* Initial release

LICENSE

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1 @@
1-
BSD 3-Clause License
2-
3-
Copyright (c) 2019, Nadia Ghebreial
4-
All rights reserved.
5-
6-
Redistribution and use in source and binary forms, with or without
7-
modification, are permitted provided that the following conditions are met:
8-
9-
* Redistributions of source code must retain the above copyright notice, this
10-
list of conditions and the following disclaimer.
11-
12-
* Redistributions in binary form must reproduce the above copyright notice,
13-
this list of conditions and the following disclaimer in the documentation
14-
and/or other materials provided with the distribution.
15-
16-
* Neither the name of the copyright holder nor the names of its
17-
contributors may be used to endorse or promote products derived from
18-
this software without specific prior written permission.
19-
20-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
21-
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22-
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
23-
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
24-
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
25-
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
26-
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
27-
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
28-
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1+
TODO: Add your license here.

README.md

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ class _MyAppState extends State<MyApp> {
6060
Future getImageAndSave() async {
6161
File image = await ImagePicker.pickImage(source: ImageSource.gallery);
6262
if (image != null && image.path != null) {
63+
64+
// Note : iOS not implemented
6365
image = await FlutterExifRotation.rotateAndSaveImage(path: image.path);
6466
6567
if (image != null) {
@@ -105,4 +107,22 @@ class _MyAppState extends State<MyApp> {
105107
}
106108
107109
```
108-
110+
### Note
111+
112+
If you created project in objc, you need additional steps.
113+
`ios/Podfile`
114+
115+
<pre>
116+
target 'Runner' do
117+
<b>use_frameworks!</b>
118+
...
119+
120+
post_install do |installer|
121+
installer.pods_project.targets.each do |target|
122+
target.build_configurations.each do |config|
123+
config.build_settings['ENABLE_BITCODE'] = 'NO'
124+
<b>config.build_settings['SWIFT_VERSION'] = '4'</b>
125+
end
126+
end
127+
end
128+
</pre>

_config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
theme: jekyll-theme-cayman

android/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
group 'io.flutter.plugins.flutterexifrotation'
1+
group 'com.cliffex.flutter_exif_rotation'
22
version '1.0-SNAPSHOT'
33

44
buildscript {
@@ -8,7 +8,7 @@ buildscript {
88
}
99

1010
dependencies {
11-
classpath 'com.android.tools.build:gradle:3.2.1'
11+
classpath 'com.android.tools.build:gradle:3.5.1'
1212
}
1313
}
1414

@@ -26,13 +26,13 @@ android {
2626

2727
defaultConfig {
2828
minSdkVersion 16
29-
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
29+
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
3030
}
3131
lintOptions {
3232
disable 'InvalidPackage'
3333
}
3434
}
3535

3636
dependencies {
37-
api 'androidx.core:core:1.0.0'
37+
implementation 'androidx.core:core:1.0.2'
3838
}

android/gradle.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
11
org.gradle.jvmargs=-Xmx1536M
2+
3+
android.enableJetifier=true
4+
android.useAndroidX=true
53.1 KB
Binary file not shown.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#Mon Sep 30 12:27:02 IST 2019
2+
distributionBase=GRADLE_USER_HOME
3+
distributionPath=wrapper/dists
4+
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

0 commit comments

Comments
 (0)