Update to latest versions (#353)

airbnb · Aug 19, 2022 · 64ecbf3 · 64ecbf3
1 parent 5ed4682
commit 64ecbf3
Show file tree

Hide file tree

Showing 5 changed files with 296 additions and 250 deletions.
diff --git a/deeplinkdispatch-processor/src/main/java/com/airbnb/deeplinkdispatch/DeepLinkProcessor.kt b/deeplinkdispatch-processor/src/main/java/com/airbnb/deeplinkdispatch/DeepLinkProcessor.kt
@@ -279,24 +279,21 @@ class DeepLinkProcessor(symbolProcessorEnvironment: SymbolProcessorEnvironment?
                 element = methodElement,
                 errorMessage = "Only static methods can be annotated with @${DEEP_LINK_CLASS.simpleName}",
             )
-        } else
-        // FIXME This is crashing with an NPE on internal classes when accessing the returnType.
-        // You can jut comment this check out for now if you need this to pass.
-            if (methodElement.returnType.typeElement?.qualifiedName !in listOf(
-                    "android.content.Intent",
-                    "androidx.core.app.TaskStackBuilder",
-                    "com.airbnb.deeplinkdispatch.DeepLinkMethodResult"
-                )
-            ) {
-                throw DeepLinkProcessorException(
-                    element = methodElement,
-                    errorMessage = (
-                        "Only `Intent`, `androidx.core.app.TaskStackBuilder` or " +
-                            "'com.airbnb.deeplinkdispatch.DeepLinkMethodResult' are supported. Please double " +
-                            "check your imports and try again."
-                        )
-                )
-            }
+        } else if (methodElement.returnType.typeElement?.qualifiedName !in listOf(
+                "android.content.Intent",
+                "androidx.core.app.TaskStackBuilder",
+                "com.airbnb.deeplinkdispatch.DeepLinkMethodResult"
+            )
+        ) {
+            throw DeepLinkProcessorException(
+                element = methodElement,
+                errorMessage = (
+                    "Only `Intent`, `androidx.core.app.TaskStackBuilder` or " +
+                        "'com.airbnb.deeplinkdispatch.DeepLinkMethodResult' are supported. Please double " +
+                        "check your imports and try again."
+                    )
+            )
+        }
     }
 
     private fun verifyHandlerMatchArgs(element: XTypeElement, uriTemplate: String) {

diff --git a/deeplinkdispatch/src/main/java/com/airbnb/deeplinkdispatch/BaseDeepLinkDelegate.kt b/deeplinkdispatch/src/main/java/com/airbnb/deeplinkdispatch/BaseDeepLinkDelegate.kt
@@ -115,6 +115,9 @@ open class BaseDeepLinkDelegate @JvmOverloads constructor(
                     result.methodResult.intent?.let { activity.startActivity(it) }
                 is DeepLinkEntry.HandlerDeepLinkEntry ->
                     callDeeplinkHandler(activity, result)
+                null -> {
+                    // No - op
+                }
             }
         }
     }

diff --git a/dependencies.gradle b/dependencies.gradle
@@ -1,21 +1,21 @@
 def versions = [
-    kotlinVersion                : '1.6.10',
+    kotlinVersion                : '1.7.10',
     appCompatVersion             : '1.4.1',
     localBroadcastManagerVersion : '1.1.0',
     roboelectricVersion          : '4.5.1',
     benchmarkVersion             : '1.0.0',
-    compileTestingVersion        : '1.4.7',
-    kspVersion                   : '1.6.10-1.0.4',
-    xProcessorVersion            : '2.4.2',
+    compileTestingVersion        : '1.4.9',
+    kspVersion                   : '1.7.10-1.0.6',
+    xProcessorVersion            : '2.5.0-alpha02',
     mockkVersion                 : '1.12.3',
     ktlintGradlePluginVersion    : '3.8.0',
     androidXTestingVersion       : '1.4.0'
 ]
 
 ext.versions = versions
 ext.androidConfig = [
-    agpVersion                          : '7.1.1',
-    compileSdkVersion                   : 31,
+    agpVersion                          : '7.2.1',
+    compileSdkVersion                   : 32,
     minSdkVersion                       : 16,
     targetSdkVersion                    : 30
 ]

diff --git a/sample/src/main/java/com/airbnb/deeplinkdispatch/sample/MainActivity.java b/sample/src/main/java/com/airbnb/deeplinkdispatch/sample/MainActivity.java