Merge pull request #26 from emeraldsanto/dev

Version 3.0.0
emeraldsanto · Aug 30, 2020 · afc8333 · afc8333
2 parents 6ae0e78 + 0d0ac40
commit afc8333
Show file tree

Hide file tree

Showing 20 changed files with 24 additions and 206 deletions.
diff --git a/.gitignore b/.gitignore
@@ -45,5 +45,8 @@ buck-out/
 # JEST
 coverage/
 
+# TypeScript
+dist/
+
 # MISC
 *.prefs
diff --git a/android/build.gradle b/android/build.gradle
@@ -14,7 +14,7 @@ import groovy.json.JsonSlurper
 
 def DEFAULT_COMPILE_SDK_VERSION = 29
 def DEFAULT_BUILD_TOOLS_VERSION = '28.0.3'
-def DEFAULT_MIN_SDK_VERSION = 1
+def DEFAULT_MIN_SDK_VERSION = 23
 def DEFAULT_TARGET_SDK_VERSION = 29
 
 def safeExtGet(prop, fallback) {
@@ -35,7 +35,7 @@ buildscript {
             jcenter()
         }
         dependencies {
-            classpath 'com.android.tools.build:gradle:3.6.3'
+            classpath 'com.android.tools.build:gradle:4.0.1'
         }
     }
     repositories {
@@ -53,8 +53,8 @@ android {
     defaultConfig {
         minSdkVersion safeExtGet('minSdkVersion', DEFAULT_MIN_SDK_VERSION)
         targetSdkVersion safeExtGet('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION)
-        versionCode 40
-        versionName "2.4.4"
+        versionCode 41
+        versionName "3.0.0"
     }
     lintOptions {
         abortOnError false
@@ -80,8 +80,7 @@ dependencies {
     //noinspection GradleDynamicVersion
     implementation 'com.facebook.react:react-native:+'
 
-    // Updating to the stable 1.0.0 release introduces crashes in production
-    implementation "androidx.security:security-crypto:1.0.0-alpha02"
+    implementation "androidx.security:security-crypto:1.1.0-alpha02"
 }
 
 def configureReactNativePom(def pom) {

diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
@@ -1,4 +1,6 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.emeraldsanto.encryptedstorage">
-
+<manifest 
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.emeraldsanto.encryptedstorage"
+>
 </manifest>
diff --git a/android/src/main/java/com/emeraldsanto/encryptedstorage/RNEncryptedStorageModule.java b/android/src/main/java/com/emeraldsanto/encryptedstorage/RNEncryptedStorageModule.java
@@ -22,11 +22,6 @@ public class RNEncryptedStorageModule extends ReactContextBaseJavaModule {
     public RNEncryptedStorageModule(ReactApplicationContext context) {
         super(context);
 
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
-            this.sharedPreferences = context.getSharedPreferences(RNEncryptedStorageModule.SHARED_PREFERENCES_FILENAME, Context.MODE_PRIVATE);
-            return;
-        }
-
         try {
             this.sharedPreferences = EncryptedSharedPreferences.create(
                 RNEncryptedStorageModule.SHARED_PREFERENCES_FILENAME,

diff --git a/dist/EncryptedStorage.d.ts b/dist/EncryptedStorage.d.ts
diff --git a/dist/EncryptedStorage.js b/dist/EncryptedStorage.js
diff --git a/dist/index.d.ts b/dist/index.d.ts
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/lib/EncryptedStorage.d.ts b/dist/lib/EncryptedStorage.d.ts
diff --git a/dist/lib/EncryptedStorage.js b/dist/lib/EncryptedStorage.js
diff --git a/dist/lib/index.d.ts b/dist/lib/index.d.ts
diff --git a/dist/lib/index.js b/dist/lib/index.js
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
@@ -192,7 +192,7 @@ dependencies {
     //noinspection GradleDynamicVersion
     implementation "com.facebook.react:react-native:+"  // From node_modules
 
-    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
+    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
 
     debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
       exclude group:'com.facebook.fbjni'

diff --git a/example/android/build.gradle b/example/android/build.gradle
@@ -3,7 +3,7 @@
 buildscript {
     ext {
         buildToolsVersion = "28.0.3"
-        minSdkVersion = 16
+        minSdkVersion = 23
         compileSdkVersion = 28
         targetSdkVersion = 28
     }
@@ -12,7 +12,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:3.5.2")
+        classpath('com.android.tools.build:gradle:4.0.1')
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Sun Aug 30 16:43:44 EDT 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -233,7 +233,7 @@ PODS:
     - React-cxxreact (= 0.62.2)
     - React-jsi (= 0.62.2)
   - React-jsinspector (0.62.2)
-  - react-native-encrypted-storage (2.4.3):
+  - react-native-encrypted-storage (2.4.4):
     - React
   - React-RCTActionSheet (0.62.2):
     - React-Core/RCTActionSheetHeaders (= 0.62.2)
@@ -443,7 +443,7 @@ SPEC CHECKSUMS:
   React-jsi: b6dc94a6a12ff98e8877287a0b7620d365201161
   React-jsiexecutor: 1540d1c01bb493ae3124ed83351b1b6a155db7da
   React-jsinspector: 512e560d0e985d0e8c479a54a4e5c147a9c83493
-  react-native-encrypted-storage: a0fad87d47f58640f6083897397f83c2e9724e46
+  react-native-encrypted-storage: aea5735891f45f04e0e222099090cece3de825ea
   React-RCTActionSheet: f41ea8a811aac770e0cc6e0ad6b270c644ea8b7c
   React-RCTAnimation: 49ab98b1c1ff4445148b72a3d61554138565bad0
   React-RCTBlob: a332773f0ebc413a0ce85942a55b064471587a71

diff --git a/example/package-lock.json b/example/package-lock.json
diff --git a/example/package.json b/example/package.json
@@ -10,7 +10,7 @@
   "dependencies": {
     "react": "16.11.0",
     "react-native": "0.62.2",
-    "react-native-encrypted-storage": "2.4.3"
+    "react-native-encrypted-storage": "emeraldsanto/react-native-encrypted-storage#dev"
   },
   "devDependencies": {
     "@babel/core": "7.6.2",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "react-native-encrypted-storage",
   "title": "React Native Encrypted Storage",
-  "version": "2.4.4",
+  "version": "3.0.0",
   "description": "A React Native wrapper over SharedPreferences and Keychain to provide a secure alternative to Async Storage",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
-Original file line number
+Diff line change
@@ Expand Up / @@ -45,5 +45,8 @@ buck-out/ @@
     # JEST
     coverage/
+    # TypeScript
+    dist/
     # MISC
     *.prefs