expo-keep-awake 12.4.0 → 12.5.0

package/CHANGELOG.md

@@ -10,6 +10,20 @@
 
 ### 💡 Others
 
+## 12.5.0 — 2023-09-04
+
+### 🎉 New features
+
+- Added support for React Native 0.73. ([#24018](https://github.com/expo/expo/pull/24018) by [@kudo](https://github.com/kudo))
+
+### 💡 Others
+
+- On Android, migrate to Expo Modules Api. ([#24012](https://github.com/expo/expo/pull/24012) by [@alanjhughes](https://github.com/alanjhughes))
+
+## 12.4.1 — 2023-08-02
+
+_This version does not introduce any user-facing changes._
+
 ## 12.4.0 — 2023-07-28
 
 _This version does not introduce any user-facing changes._

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '12.4.0'
+version = '12.5.0'
 
 buildscript {
   def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
@@ -53,13 +53,16 @@ afterEvaluate {
 android {
   compileSdkVersion safeExtGet("compileSdkVersion", 33)
 
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_11
-    targetCompatibility JavaVersion.VERSION_11
-  }
+  def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION
+  if (agpVersion.tokenize('.')[0].toInteger() < 8) {
+    compileOptions {
+      sourceCompatibility JavaVersion.VERSION_11
+      targetCompatibility JavaVersion.VERSION_11
+    }
 
-  kotlinOptions {
-    jvmTarget = JavaVersion.VERSION_11.majorVersion
+    kotlinOptions {
+      jvmTarget = JavaVersion.VERSION_11.majorVersion
+    }
   }
 
   namespace "expo.modules.keepawake"
@@ -67,7 +70,7 @@ android {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 33)
     versionCode 16
-    versionName "12.4.0"
+    versionName "12.5.0"
   }
   lintOptions {
     abortOnError false

package/android/src/main/java/expo/modules/keepawake/KeepAwakeExceptions.kt

@@ -0,0 +1,12 @@
+package expo.modules.keepawake
+
+import expo.modules.kotlin.exception.CodedException
+
+internal class ActivateKeepAwakeException :
+  CodedException("Unable to activate keep awake")
+
+internal class DeactivateKeepAwakeException :
+  CodedException("Unable to deactivate keep awake. However, it probably is deactivated already")
+
+internal class MissingModuleException(moduleName: String) :
+  CodedException("Module '$moduleName' not found. Are you sure all modules are linked correctly?")

package/android/src/main/java/expo/modules/keepawake/KeepAwakeModule.kt

@@ -1,54 +1,37 @@
 // Copyright 2015-present 650 Industries. All rights reserved.
 package expo.modules.keepawake
 
-import android.content.Context
-
-import expo.modules.core.ExportedModule
-import expo.modules.core.ModuleRegistry
-import expo.modules.core.interfaces.services.KeepAwakeManager
-import expo.modules.core.ModuleRegistryDelegate
-import expo.modules.core.Promise
-import expo.modules.core.interfaces.ExpoMethod
 import expo.modules.core.errors.CurrentActivityNotFoundException
+import expo.modules.core.interfaces.services.KeepAwakeManager
+import expo.modules.kotlin.Promise
+import expo.modules.kotlin.modules.Module
+import expo.modules.kotlin.modules.ModuleDefinition
+
+class KeepAwakeModule : Module() {
+  private val keepAwakeManager: KeepAwakeManager
+    get() = appContext.legacyModule() ?: throw MissingModuleException("KeepAwakeManager")
+
+  override fun definition() = ModuleDefinition {
+    Name("ExpoKeepAwake")
+
+    AsyncFunction("activate") { tag: String, promise: Promise ->
+      try {
+        keepAwakeManager.activate(tag) { promise.resolve(true) }
+      } catch (ex: CurrentActivityNotFoundException) {
+        promise.reject(ActivateKeepAwakeException())
+      }
+    }
 
-private const val NAME = "ExpoKeepAwake"
-private const val NO_ACTIVITY_ERROR_CODE = "NO_CURRENT_ACTIVITY"
-
-class KeepAwakeModule(
-  context: Context,
-  private val moduleRegistryDelegate: ModuleRegistryDelegate = ModuleRegistryDelegate()
-) : ExportedModule(context) {
-
-  private val keepAwakeManager: KeepAwakeManager by moduleRegistry()
-
-  private inline fun <reified T> moduleRegistry() = moduleRegistryDelegate.getFromModuleRegistry<T>()
-
-  override fun onCreate(moduleRegistry: ModuleRegistry) {
-    moduleRegistryDelegate.onCreate(moduleRegistry)
-  }
-
-  override fun getName(): String {
-    return NAME
-  }
-
-  @ExpoMethod
-  fun activate(tag: String, promise: Promise) {
-    try {
-      keepAwakeManager.activate(tag) { promise.resolve(true) }
-    } catch (ex: CurrentActivityNotFoundException) {
-      promise.reject(NO_ACTIVITY_ERROR_CODE, "Unable to activate keep awake")
+    AsyncFunction("deactivate") { tag: String, promise: Promise ->
+      try {
+        keepAwakeManager.deactivate(tag) { promise.resolve(true) }
+      } catch (ex: CurrentActivityNotFoundException) {
+        promise.reject(DeactivateKeepAwakeException())
+      }
     }
-  }
 
-  @ExpoMethod
-  fun deactivate(tag: String, promise: Promise) {
-    try {
-      keepAwakeManager.deactivate(tag) { promise.resolve(true) }
-    } catch (ex: CurrentActivityNotFoundException) {
-      promise.reject(NO_ACTIVITY_ERROR_CODE, "Unable to deactivate keep awake. However, it probably is deactivated already.")
+    AsyncFunction("isActivated") {
+      return@AsyncFunction keepAwakeManager.isActivated
     }
   }
-
-  val isActivated: Boolean
-    get() = keepAwakeManager.isActivated
 }

package/android/src/main/java/expo/modules/keepawake/KeepAwakePackage.kt

@@ -2,15 +2,10 @@ package expo.modules.keepawake
 
 import android.content.Context
 
-import expo.modules.core.ExportedModule
 import expo.modules.core.interfaces.InternalModule
 import expo.modules.core.interfaces.Package
 
 class KeepAwakePackage : Package {
-  override fun createExportedModules(context: Context): List<ExportedModule> {
-    return listOf(KeepAwakeModule(context))
-  }
-
   override fun createInternalModules(context: Context): List<InternalModule> {
     return listOf(ExpoKeepAwakeManager())
   }

package/expo-module.config.json

@@ -1,6 +1,9 @@
 {
   "platforms": ["ios", "android"],
   "ios": {
-    "modulesClassNames": ["KeepAwakeModule"]
+    "modules": ["KeepAwakeModule"]
+  },
+  "android": {
+    "modules": ["expo.modules.keepawake.KeepAwakeModule"]
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-keep-awake",
-  "version": "12.4.0",
+  "version": "12.5.0",
   "description": "Provides a React component that prevents the screen sleeping when rendered. It also exposes static methods to control the behavior imperatively.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -42,5 +42,5 @@
   "jest": {
     "preset": "expo-module-scripts"
   },
-  "gitHead": "663654577a7068c641b5e9474efbc502e3f334ea"
+  "gitHead": "79607a7325f47aa17c36d266100d09a4ff2cc544"
 }

package/tsconfig.json

@@ -5,5 +5,5 @@
     "outDir": "./build"
   },
   "include": ["./src"],
-  "exclude": ["**/__mocks__/*", "**/__tests__/*", "**/__stories__/*"]
+  "exclude": ["**/__mocks__/*", "**/__tests__/*"]
 }