Skip to content

Commit

Permalink
V 2.0.0 Release
Browse files Browse the repository at this point in the history
  • Loading branch information
AmolGangadhare committed Apr 19, 2021
1 parent 73e2505 commit 36e4bbb
Show file tree
Hide file tree
Showing 20 changed files with 179 additions and 79 deletions.
3 changes: 3 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

91 changes: 59 additions & 32 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
## 1.0.2
## 2.0.0

* Android: Fixes #137 and #132
* iOS: Fixes #97
* PR: #184 and #182
* Null safety migration

## 1.0.1

Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,26 +23,26 @@ PLEASE FOLLOW **iOS** STEPS CAREFULLY

### iOS - Requires Swift support

Deployment target : 11
Deployment target : 12

#### 1. Fresh start:
1. Create a new flutter project. Please check for **Include swift support for iOS code**.
2. After creating new flutter project open `/ios` project in Xcode and set minimum **deployment target to 11**
2. After creating new flutter project open `/ios` project in Xcode and set minimum **deployment target to 12**
and set **Swift version to 5**.
3. After setting up the deployment target and swift version, close the Xcode then run **pod install** in `/ios` in flutter project.

You have done with basic configuration now proceed to section **How to use**.

#### 2. Adding to existing flutter app:
#### If your existing ios code is **Swift** then you just need to do following.
1. Set **minimum deployment target to 10** and set **Swift version to 5**.
1. Set **minimum deployment target to 12** and set **Swift version to 5**.
2. Close the Xcode and run **pod install** in `/ios` in flutter project.
3. Now proceed to section **How to use**.

#### If your existing ios code is **Objective-C** then you need to do following.
1. Create a new flutter project with same name at different location (Don't forget to check **Include swift support for iOS code** while creating)
2. Just copy newly created `/ios` folder from project and replace with existing `/ios`.
3. Open ios project in Xcode and set **minimum deployment target to 11** and set **Swift version to 5**.
3. Open ios project in Xcode and set **minimum deployment target to 12** and set **Swift version to 5**.
4. Run **pod install** in `/ios`

**Note: If you did any changes in ios part before, you might need to make these configuration again**
Expand All @@ -62,7 +62,7 @@ After making the changes in Android ans iOS add flutter_barcode_scanner to `pubs
```
dependencies:
...
flutter_barcode_scanner: ^1.0.2
flutter_barcode_scanner: ^2.0.0
```

### One time scan
Expand Down
Binary file modified android/.idea/caches/build_file_checksums.ser
Binary file not shown.
12 changes: 6 additions & 6 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:3.5.3'
classpath 'com.android.tools.build:gradle:4.1.3'
}
}

Expand All @@ -22,11 +22,11 @@ rootProject.allprojects {
apply plugin: 'com.android.library'

android {
compileSdkVersion 29
compileSdkVersion 30

defaultConfig {
minSdkVersion 16
targetSdkVersion 29
targetSdkVersion 30
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
lintOptions {
Expand All @@ -35,8 +35,8 @@ android {
}

dependencies {
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'com.google.android.material:material:1.0.0'
implementation 'com.google.android.gms:play-services-vision:19.0.0'
implementation 'com.google.android.material:material:1.3.0'
implementation 'com.google.android.gms:play-services-vision:20.1.3'
}
4 changes: 2 additions & 2 deletions android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Sep 18 12:55:30 IST 2019
#Tue Apr 20 01:37:31 IST 2021
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
Loading

0 comments on commit 36e4bbb

Please sign in to comment.