expo-json-utils 0.2.1 → 0.3.0

package/CHANGELOG.md

@@ -10,7 +10,13 @@
 
 ### 💡 Others
 
-## 0.2.1 — 2022-02-01
+## 0.3.0 — 2022-04-18
+
+### ⚠️ Notices
+
+- On Android bump `compileSdkVersion` to `31`, `targetSdkVersion` to `31` and `Java` version to `11`. ([#16941](https://github.com/expo/expo/pull/16941) by [@bbarthec](https://github.com/bbarthec))
+
+## 0.2.1 - 2022-02-01
 
 ### 🐛 Bug fixes
 

package/android/build.gradle

@@ -3,20 +3,35 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '0.2.1'
+version = '0.3.0'
 
 buildscript {
+  def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
+  if (expoModulesCorePlugin.exists()) {
+    apply from: expoModulesCorePlugin
+    applyKotlinExpoModulesCorePlugin()
+  }
+
   // Simple helper that allows the root project to override versions declared by this library.
   ext.safeExtGet = { prop, fallback ->
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
   }
 
+  // Ensures backward compatibility
+  ext.getKotlinVersion = {
+    if (ext.has("kotlinVersion")) {
+      ext.kotlinVersion()
+    } else {
+      ext.safeExtGet("kotlinVersion", "1.6.10")
+    }
+  }
+
   repositories {
     mavenCentral()
   }
 
   dependencies {
-    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${safeExtGet('kotlinVersion', '1.4.21')}")
+    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${getKotlinVersion()}")
   }
 }
 
@@ -44,18 +59,22 @@ afterEvaluate {
 }
 
 android {
-  compileSdkVersion safeExtGet("compileSdkVersion", 30)
+  compileSdkVersion safeExtGet("compileSdkVersion", 31)
 
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+    sourceCompatibility JavaVersion.VERSION_11
+    targetCompatibility JavaVersion.VERSION_11
+  }
+
+  kotlinOptions {
+    jvmTarget = JavaVersion.VERSION_11.majorVersion
   }
 
   defaultConfig {
     minSdkVersion safeExtGet("minSdkVersion", 21)
-    targetSdkVersion safeExtGet("targetSdkVersion", 30)
+    targetSdkVersion safeExtGet("targetSdkVersion", 31)
     versionCode 31
-    versionName '0.2.1'
+    versionName '0.3.0'
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
   }
   lintOptions {
@@ -64,25 +83,22 @@ android {
   testOptions {
     unitTests.includeAndroidResources = true
   }
-  sourceSets {
-    androidTest.assets.srcDirs += files("$projectDir/src/androidTest/schemas".toString())
-  }
 }
 
 dependencies {
   testImplementation 'junit:junit:4.12'
-  testImplementation 'androidx.test:core:1.0.0'
+  testImplementation 'androidx.test:core:1.4.0'
   testImplementation 'org.mockito:mockito-core:1.10.19'
-  testImplementation 'io.mockk:mockk:1.10.6'
+  testImplementation 'io.mockk:mockk:1.12.3'
 
   androidTestImplementation 'org.amshove.kluent:kluent-android:1.68'
-  androidTestImplementation 'androidx.test:runner:1.1.0'
-  androidTestImplementation 'androidx.test:core:1.0.0'
-  androidTestImplementation 'androidx.test:rules:1.1.0'
+  androidTestImplementation 'androidx.test:runner:1.4.0'
+  androidTestImplementation 'androidx.test:core:1.4.0'
+  androidTestImplementation 'androidx.test:rules:1.4.0'
   androidTestImplementation 'org.mockito:mockito-android:3.7.7'
-  androidTestImplementation 'io.mockk:mockk-android:1.10.6'
+  androidTestImplementation 'io.mockk:mockk-android:1.12.3'
 
-  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${safeExtGet('kotlinVersion', '1.4.21')}"
+  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${getKotlinVersion()}"
 }
 repositories {
   mavenCentral()

package/ios/EXJSONUtils/NSDictionary+EXJSONUtils.h

@@ -4,16 +4,16 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface NSDictionary (EXJSONUtils)
+@interface NSDictionary<__covariant KeyType, __covariant ObjectType> (EXJSONUtils)
 
-- (NSString *)stringForKey:(NSString *)key;
-- (nullable NSString *)nullableStringForKey:(NSString *)key;
-- (NSNumber *)numberForKey:(NSString *)key;
-- (nullable NSNumber *)nullableNumberForKey:(NSString *)key;
-- (NSArray *)arrayForKey:(NSString *)key;
-- (nullable NSArray *)nullableArrayForKey:(NSString *)key;
-- (NSDictionary *)dictionaryForKey:(NSString *)key;
-- (nullable NSDictionary *)nullableDictionaryForKey:(NSString *)key;
+- (NSString *)stringForKey:(KeyType)key;
+- (nullable NSString *)nullableStringForKey:(KeyType)key;
+- (NSNumber *)numberForKey:(KeyType)key;
+- (nullable NSNumber *)nullableNumberForKey:(KeyType)key;
+- (NSArray *)arrayForKey:(KeyType)key;
+- (nullable NSArray *)nullableArrayForKey:(KeyType)key;
+- (NSDictionary *)dictionaryForKey:(KeyType)key;
+- (nullable NSDictionary *)nullableDictionaryForKey:(KeyType)key;
 
 @end
 

package/ios/EXJSONUtils/NSDictionary+EXJSONUtils.m

@@ -19,35 +19,35 @@
 
 @implementation NSDictionary (EXJSONUtils)
 
-- (NSString *)stringForKey:(NSString *)key {
+- (NSString *)stringForKey:(id)key {
   return EXGetNonNullManifestValue(NSString, key);
 }
 
-- (nullable NSString *)nullableStringForKey:(NSString *)key {
+- (nullable NSString *)nullableStringForKey:(id)key {
   return EXGetNullableManifestValue(NSString, key);
 }
 
-- (NSNumber *)numberForKey:(NSString *)key {
+- (NSNumber *)numberForKey:(id)key {
   return EXGetNonNullManifestValue(NSNumber, key);
 }
 
-- (nullable NSNumber *)nullableNumberForKey:(NSString *)key {
+- (nullable NSNumber *)nullableNumberForKey:(id)key {
   return EXGetNullableManifestValue(NSNumber, key);
 }
 
-- (NSArray *)arrayForKey:(NSString *)key {
+- (NSArray *)arrayForKey:(id)key {
   return EXGetNonNullManifestValue(NSArray, key);
 }
 
-- (nullable NSArray *)nullableArrayForKey:(NSString *)key {
+- (nullable NSArray *)nullableArrayForKey:(id)key {
   return EXGetNullableManifestValue(NSArray, key);
 }
 
-- (NSDictionary *)dictionaryForKey:(NSString *)key {
+- (NSDictionary *)dictionaryForKey:(id)key {
   return EXGetNonNullManifestValue(NSDictionary, key);
 }
 
-- (nullable NSDictionary *)nullableDictionaryForKey:(NSString *)key {
+- (nullable NSDictionary *)nullableDictionaryForKey:(id)key {
   return EXGetNullableManifestValue(NSDictionary, key);
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-json-utils",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "description": "Utilities for reading NSDictionaries (iOS) and JSONObjects (Android).",
   "main": "index.js",
   "keywords": [
@@ -19,5 +19,5 @@
   "author": "650 Industries, Inc.",
   "license": "MIT",
   "homepage": "https://docs.expo.dev/versions/latest/sdk/module-template",
-  "gitHead": "ba24eba18bf4f4d4b0d54828992d81a2bb18246a"
+  "gitHead": "22dce752354bb429c84851bc4389abe47a766b1f"
 }