tapjoy-react-native-sdk 14.4.0 → 14.6.0

package/android/build.gradle

@@ -8,7 +8,7 @@ buildscript {
   }
 
   dependencies {
-    classpath "com.android.tools.build:gradle:8.1.2"
+    classpath "com.android.tools.build:gradle:8.11.1"
     // noinspection DifferentKotlinGradleVersion
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     classpath "com.facebook.react:react-native-gradle-plugin"
@@ -21,12 +21,7 @@ def isNewArchitectureEnabled() {
 
 apply plugin: "com.android.library"
 apply plugin: "kotlin-android"
-
-def appProject = rootProject.allprojects.find { it.plugins.hasPlugin('com.android.application') }
-
-if (isNewArchitectureEnabled()) {
-  apply plugin: "com.facebook.react"
-}
+apply plugin: "com.facebook.react"
 
 def getExtOrDefault(name) {
   return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["TapjoyReactNativeSdk_" + name]
@@ -79,16 +74,14 @@ dependencies {
   // For < 0.71, this will be from the local maven repo
   // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
   //noinspection GradleDynamicVersion
-  implementation 'com.facebook.react:react-native:0.74.1'
+  implementation 'com.facebook.react:react-native:0.81.0'
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  implementation 'com.tapjoy:tapjoy-android-sdk:14.4.0'
+  implementation 'com.tapjoy:tapjoy-android-sdk:14.6.0'
   implementation "com.google.android.gms:play-services-ads-identifier:18.0.1"
 }
 
-if (isNewArchitectureEnabled()) {
-  react {
-    jsRootDir = file("../src/")
-    libraryName = "TapjoyReactNativeSdk"
-    codegenJavaPackageName = "com.tapjoyreactnativesdk"
-  }
+react {
+  jsRootDir = file("../src/")
+  libraryName = "TapjoyReactNativeSdk"
+  codegenJavaPackageName = "com.tapjoyreactnativesdk"
 }

package/android/gradle.properties

@@ -1,6 +1,6 @@
-TapjoyReactNativeSdk_kotlinVersion=1.9.24
+TapjoyReactNativeSdk_kotlinVersion=2.1.20
 TapjoyReactNativeSdk_minSdkVersion=21
-TapjoyReactNativeSdk_targetSdkVersion=34
-TapjoyReactNativeSdk_compileSdkVersion=34
+TapjoyReactNativeSdk_targetSdkVersion=36
+TapjoyReactNativeSdk_compileSdkVersion=36
 TapjoyReactNativeSdk_ndkversion=25.1.8937393
 android.useAndroidX=true

package/android/src/main/java/com/tapjoyreactnativesdk/TJOfferwallDiscoverNativeView.kt

@@ -79,8 +79,8 @@ class TJOfferwallDiscoverNativeView : TJOfferwallDiscoverView, TJOfferwallDiscov
     }
 }
 
-class OfferwallDiscoverEvent(surfaceId: Int, viewId: Int, private val eventName: String, private val data: WritableMap) : Event<OfferwallDiscoverEvent>(surfaceId, viewId) {
-    override fun getEventName() = eventName
+class OfferwallDiscoverEvent(surfaceId: Int, viewId: Int, private val name: String, private val data: WritableMap) : Event<OfferwallDiscoverEvent>(surfaceId, viewId) {
+    override fun getEventName() = name
 
     // All events for a given view can be coalesced.
     override fun getCoalescingKey(): Short = 0

package/android/src/main/java/com/tapjoyreactnativesdk/TJOfferwallDiscoverNativeViewManager.kt

@@ -3,23 +3,16 @@ package com.tapjoyreactnativesdk
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.common.MapBuilder
+import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.SimpleViewManager
 import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.annotations.ReactProp
 
-enum class Command(private val value:String) {
-    REQUEST_CONTENT("requestContent"),
-    CLEAR_CONTENT("clearContent");
-
-    fun getValue(): String {
-        return value
-    }
-}
-
+@ReactModule(name = TJOfferwallDiscoverNativeViewManager.REACT_CLASS)
 class TJOfferwallDiscoverNativeViewManager(
         private val callerContext: ReactApplicationContext
 ) : SimpleViewManager<TJOfferwallDiscoverNativeView>() {
 
-    var view: TJOfferwallDiscoverNativeView? = null;
     override fun getName() = REACT_CLASS
 
     companion object {
@@ -32,15 +25,27 @@ class TJOfferwallDiscoverNativeViewManager(
 
     override fun receiveCommand(view: TJOfferwallDiscoverNativeView, commandId: String, args: ReadableArray?) {
         super.receiveCommand(view, commandId, args)
-        if (commandId == Command.REQUEST_CONTENT.getValue()) {
-            view.requestContent(args!!.getString(0) ?: " ")
-        } else if (commandId == Command.CLEAR_CONTENT.getValue()) {
-            view.clearContent()
+        when (commandId) {
+            "requestContent" -> {
+                args?.getString(0)?.let { placement ->
+                    view.requestContent(placement)
+                }
+            }
+            "clearContent" -> {
+                view.clearContent()
+            }
         }
     }
 
-    override fun getExportedCustomDirectEventTypeConstants(): Map<String, Any?>? {
-        return MapBuilder.of<String, Any?>(
+    override fun getCommandsMap(): Map<String, Int>? {
+        return MapBuilder.of(
+            "requestContent", 1,
+            "clearContent", 2
+        )
+    }
+
+    override fun getExportedCustomDirectEventTypeConstants(): Map<String, Any>? {
+        return MapBuilder.of(
             "onRequestSuccess", MapBuilder.of("registrationName", "onRequestSuccess"),
             "onRequestFailure", MapBuilder.of("registrationName", "onRequestFailure"),
             "onContentReady", MapBuilder.of("registrationName", "onContentReady"),