expo-dev-launcher 0.10.2 → 0.10.5

package/CHANGELOG.md

@@ -10,6 +10,25 @@
 
 ### 💡 Others
 
+## 0.10.5 — 2022-04-26
+
+_This version does not introduce any user-facing changes._
+
+## 0.10.4 — 2022-02-07
+
+### 🐛 Bug fixes
+
+- Fix opening published projects on Android. ([#16157](https://github.com/expo/expo/pull/16157) by [@esamelson](https://github.com/esamelson))
+
+## 0.10.3 — 2022-02-01
+
+### 🐛 Bug fixes
+
+- Added `android:exported="true"` to the activity, cause on Android 12 and higher it needs to [explicity declared](https://developer.android.com/about/versions/12/behavior-changes-12#exported). ([#16367](https://github.com/expo/expo/pull/16367) by [@wbroek](https://github.com/wbroek))
+- Fix build errors on React Native 0.66 caused by `okio` and `okhttp`. ([#15632](https://github.com/expo/expo/pull/15632) by [@kudo](https://github.com/kudo))
+- Fix `Plugin with id 'maven' not found` build error from Android Gradle 7. ([#16080](https://github.com/expo/expo/pull/16080) by [@kudo](https://github.com/kudo))
+- Fix regression in deep linking configuration. ([#16125](https://github.com/expo/expo/pull/16125) by [@ajsmth](https://github.com/ajsmth))
+
 ## 0.10.2 — 2022-01-18
 
 _This version does not introduce any user-facing changes._

package/android/build.gradle

@@ -2,7 +2,7 @@ import groovy.json.JsonSlurper
 
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'maven'
+apply plugin: 'maven-publish'
 
 buildscript {
   // Simple helper that allows the root project to override versions declared by this library.
@@ -25,7 +25,7 @@ android {
     minSdkVersion safeExtGet('minSdkVersion', 21)
     targetSdkVersion safeExtGet('targetSdkVersion', 30)
     versionCode 9
-    versionName "0.10.2"
+    versionName "0.10.5"
   }
 
   lintOptions {
@@ -159,3 +159,30 @@ def getRNVersion() {
       patch
   )
 }
+
+// [BEGIN] Workaround okhttp/okio compatibility issue
+// Remove when we drop support for SDK 44
+def okhttpPinnedArtifacts = []
+configurations.implementation.getDependencies().removeIf { it ->
+  if (it.group == 'com.squareup.okhttp3' && it.name == 'okhttp') {
+    okhttpPinnedArtifacts.add(it)
+    return true
+  }
+  return false
+}
+okhttpPinnedArtifacts.each { artifact ->
+  dependencies.add('compileOnly', artifact)
+  dependencies.add('testImplementation', artifact)
+  configurations.all { conf ->
+    resolutionStrategy.eachDependency { DependencyResolveDetails details ->
+      def requested = details.requested
+      // Only to pin old okhttp in compile phase because mockwebserver requires okhttp4
+      if (conf.name.contains('Compile')) {
+        if (requested.group == artifact.group && requested.name == artifact.name) {
+          details.useVersion artifact.version
+        }
+      }
+    }
+  }
+}
+// [END] Workaround okhttp/okio compatibility issue

package/android/src/debug/AndroidManifest.xml

@@ -0,0 +1,7 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+  package="expo.modules.devlauncher">
+
+  <application>
+    <meta-data android:name="expo.modules.updates.AUTO_SETUP" android:value="false"/>
+  </application>
+</manifest>

package/android/src/main/AndroidManifest.xml

@@ -6,7 +6,8 @@
       android:name="expo.modules.devlauncher.launcher.DevLauncherActivity"
       android:screenOrientation="portrait"
       android:theme="@style/Theme.DevLauncher.LauncherActivity"
-      android:launchMode="singleTask" 
+      android:launchMode="singleTask"
+      android:exported="true"
       >
       <intent-filter>
         <action android:name="android.intent.action.VIEW"/>

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "expo-dev-launcher",
   "title": "Expo Development Launcher",
-  "version": "0.10.2",
+  "version": "0.10.5",
   "description": "Pre-release version of the Expo development launcher package for testing.",
   "main": "build/DevLauncher.js",
   "types": "build/DevLauncher.d.ts",
@@ -32,7 +32,7 @@
     "@expo/config-plugins": "^4.0.14",
     "resolve-from": "^5.0.0",
     "semver": "^7.3.5",
-    "expo-dev-menu": "0.9.2"
+    "expo-dev-menu": "0.9.3"
   },
   "devDependencies": {
     "@react-navigation/bottom-tabs": "^6.0.9",
@@ -62,5 +62,5 @@
       "./setupTests.ts"
     ]
   },
-  "gitHead": "7add72f8da01964733755ebc94a1963827e428a0"
+  "gitHead": "1b93b3b57477cd50cba0f92b7e7b5fdc4446bcda"
 }

package/plugin/build/withDevLauncherAppDelegate.js

@@ -19,12 +19,16 @@ const DEV_LAUNCHER_APP_DELEGATE_SOURCE_FOR_URL = `  #if defined(EX_DEV_LAUNCHER_
   #else
   return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index" fallbackResource:nil];
   #endif`;
+const DEV_LAUNCHER_APP_DELEGATE_ON_DEEP_LINK_TO_REMOVE = new RegExp('return (' +
+    escapeRegExpCharacters('[super application:application openURL:url options:options] || ') +
+    ')?' +
+    escapeRegExpCharacters('[RCTLinkingManager application:application openURL:url options:options];'));
 const DEV_LAUNCHER_APP_DELEGATE_ON_DEEP_LINK = `#if defined(EX_DEV_LAUNCHER_ENABLED)
   if ([EXDevLauncherController.sharedInstance onDeepLink:url options:options]) {
     return true;
   }
   #endif
-  return [RCTLinkingManager application:application openURL:url options:options];`;
+  $&`;
 const DEV_LAUNCHER_APP_DELEGATE_IOS_IMPORT = `
 #if defined(EX_DEV_LAUNCHER_ENABLED)
 #include <EXDevLauncher/EXDevLauncherController.h>
@@ -192,7 +196,7 @@ function removeDevMenuInit(appDelegate) {
 }
 function addDeepLinkHandler(appDelegate) {
     if (!appDelegate.includes(DEV_LAUNCHER_APP_DELEGATE_ON_DEEP_LINK)) {
-        appDelegate = appDelegate.replace('return [RCTLinkingManager application:application openURL:url options:options];', DEV_LAUNCHER_APP_DELEGATE_ON_DEEP_LINK);
+        appDelegate = appDelegate.replace(DEV_LAUNCHER_APP_DELEGATE_ON_DEEP_LINK_TO_REMOVE, DEV_LAUNCHER_APP_DELEGATE_ON_DEEP_LINK);
     }
     return appDelegate;
 }
@@ -263,9 +267,7 @@ See the expo-dev-client installation instructions to modify your AppDelegate man
     if (!appDelegate.includes(DEV_LAUNCHER_APP_DELEGATE_CONTROLLER_DELEGATE)) {
         appDelegate += DEV_LAUNCHER_APP_DELEGATE_CONTROLLER_DELEGATE;
     }
-    if (!appDelegate.includes(DEV_LAUNCHER_APP_DELEGATE_ON_DEEP_LINK)) {
-        appDelegate = appDelegate.replace('return [RCTLinkingManager application:application openURL:url options:options];', DEV_LAUNCHER_APP_DELEGATE_ON_DEEP_LINK);
-    }
+    appDelegate = addDeepLinkHandler(appDelegate);
     appDelegate = changeDebugURL(appDelegate);
     appDelegate = removeDevMenuInit(appDelegate);
     return appDelegate;

package/plugin/src/withDevLauncherAppDelegate.ts

@@ -17,12 +17,20 @@ const DEV_LAUNCHER_APP_DELEGATE_SOURCE_FOR_URL = `  #if defined(EX_DEV_LAUNCHER_
   #else
   return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index" fallbackResource:nil];
   #endif`;
+const DEV_LAUNCHER_APP_DELEGATE_ON_DEEP_LINK_TO_REMOVE = new RegExp(
+  'return (' +
+    escapeRegExpCharacters('[super application:application openURL:url options:options] || ') +
+    ')?' +
+    escapeRegExpCharacters(
+      '[RCTLinkingManager application:application openURL:url options:options];'
+    )
+);
 const DEV_LAUNCHER_APP_DELEGATE_ON_DEEP_LINK = `#if defined(EX_DEV_LAUNCHER_ENABLED)
   if ([EXDevLauncherController.sharedInstance onDeepLink:url options:options]) {
     return true;
   }
   #endif
-  return [RCTLinkingManager application:application openURL:url options:options];`;
+  $&`;
 const DEV_LAUNCHER_APP_DELEGATE_IOS_IMPORT = `
 #if defined(EX_DEV_LAUNCHER_ENABLED)
 #include <EXDevLauncher/EXDevLauncherController.h>
@@ -223,7 +231,7 @@ function removeDevMenuInit(appDelegate: string): string {
 function addDeepLinkHandler(appDelegate: string): string {
   if (!appDelegate.includes(DEV_LAUNCHER_APP_DELEGATE_ON_DEEP_LINK)) {
     appDelegate = appDelegate.replace(
-      'return [RCTLinkingManager application:application openURL:url options:options];',
+      DEV_LAUNCHER_APP_DELEGATE_ON_DEEP_LINK_TO_REMOVE,
       DEV_LAUNCHER_APP_DELEGATE_ON_DEEP_LINK
     );
   }
@@ -338,13 +346,7 @@ See the expo-dev-client installation instructions to modify your AppDelegate man
     appDelegate += DEV_LAUNCHER_APP_DELEGATE_CONTROLLER_DELEGATE;
   }
 
-  if (!appDelegate.includes(DEV_LAUNCHER_APP_DELEGATE_ON_DEEP_LINK)) {
-    appDelegate = appDelegate.replace(
-      'return [RCTLinkingManager application:application openURL:url options:options];',
-      DEV_LAUNCHER_APP_DELEGATE_ON_DEEP_LINK
-    );
-  }
-
+  appDelegate = addDeepLinkHandler(appDelegate);
   appDelegate = changeDebugURL(appDelegate);
   appDelegate = removeDevMenuInit(appDelegate);
   return appDelegate;