expo-keep-awake 12.8.2 → 13.0.1

package/CHANGELOG.md

@@ -10,11 +10,21 @@
 
 ### 💡 Others
 
-## 12.8.2 — 2024-01-18
+## 13.0.1 — 2024-04-23
 
 _This version does not introduce any user-facing changes._
 
-## 12.8.1 — 2024-01-10
+## 13.0.0 — 2024-04-18
+
+### 💡 Others
+
+- Removed deprecated backward compatible Gradle settings. ([#28083](https://github.com/expo/expo/pull/28083) by [@kudo](https://github.com/kudo))
+
+## 12.8.2 - 2024-01-18
+
+_This version does not introduce any user-facing changes._
+
+## 12.8.1 - 2024-01-10
 
 ### 🎉 New features
 

package/android/build.gradle

@@ -1,107 +1,19 @@
 apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '12.8.2'
+version = '13.0.1'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
-if (expoModulesCorePlugin.exists()) {
-  apply from: expoModulesCorePlugin
-  applyKotlinExpoModulesCorePlugin()
-  // Remove this check, but keep the contents after SDK49 support is dropped
-  if (safeExtGet("expoProvidesDefaultConfig", false)) {
-    useExpoPublishing()
-    useCoreDependencies()
-  }
-}
-
-buildscript {
-  // 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.8.10")
-    }
-  }
-
-  repositories {
-    mavenCentral()
-  }
-
-  dependencies {
-    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${getKotlinVersion()}")
-  }
-}
-
-// Remove this if and it's contents, when support for SDK49 is dropped
-if (!safeExtGet("expoProvidesDefaultConfig", false)) {
-  afterEvaluate {
-    publishing {
-      publications {
-        release(MavenPublication) {
-          from components.release
-        }
-      }
-      repositories {
-        maven {
-          url = mavenLocal().url
-        }
-      }
-    }
-  }
-}
+apply from: expoModulesCorePlugin
+applyKotlinExpoModulesCorePlugin()
+useCoreDependencies()
+useDefaultAndroidSdkVersions()
+useExpoPublishing()
 
 android {
-  // Remove this if and it's contents, when support for SDK49 is dropped
-  if (!safeExtGet("expoProvidesDefaultConfig", false)) {
-    compileSdkVersion safeExtGet("compileSdkVersion", 34)
-
-    defaultConfig {
-      minSdkVersion safeExtGet("minSdkVersion", 23)
-      targetSdkVersion safeExtGet("targetSdkVersion", 34)
-    }
-
-    publishing {
-      singleVariant("release") {
-        withSourcesJar()
-      }
-    }
-
-    lintOptions {
-      abortOnError false
-    }
-  }
-
-  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
-    }
-  }
-
   namespace "expo.modules.keepawake"
   defaultConfig {
     versionCode 16
-    versionName "12.8.2"
-  }
-}
-
-dependencies {
-  // Remove this if and it's contents, when support for SDK49 is dropped
-  if (!safeExtGet("expoProvidesDefaultConfig", false)) {
-    implementation project(':expo-modules-core')
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${getKotlinVersion()}"
+    versionName "13.0.1"
   }
 }

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

@@ -2,29 +2,26 @@ package expo.modules.keepawake
 
 import android.app.Activity
 import android.view.WindowManager
-
-import expo.modules.core.interfaces.services.KeepAwakeManager
-import expo.modules.core.interfaces.InternalModule
 import expo.modules.core.ModuleRegistry
-import expo.modules.core.ModuleRegistryDelegate
 import expo.modules.core.errors.CurrentActivityNotFoundException
 import expo.modules.core.interfaces.ActivityProvider
+import expo.modules.core.interfaces.InternalModule
+import expo.modules.core.interfaces.services.KeepAwakeManager
 
-import java.util.HashSet
-
-class ExpoKeepAwakeManager(private val moduleRegistryDelegate: ModuleRegistryDelegate = ModuleRegistryDelegate()) : KeepAwakeManager, InternalModule {
+class ExpoKeepAwakeManager : KeepAwakeManager, InternalModule {
   private val tags: MutableSet<String> = HashSet()
 
-  private inline fun <reified T> moduleRegistry() = moduleRegistryDelegate.getFromModuleRegistry<T>()
+  private lateinit var moduleRegistry: ModuleRegistry
 
   override fun onCreate(moduleRegistry: ModuleRegistry) {
-    moduleRegistryDelegate.onCreate(moduleRegistry)
+    this.moduleRegistry = moduleRegistry
   }
 
   @get:Throws(CurrentActivityNotFoundException::class)
   private val currentActivity: Activity
     get() {
-      val activityProvider: ActivityProvider by moduleRegistry()
+      val activityProvider = moduleRegistry.getModule(ActivityProvider::class.java)
+        ?: throw CurrentActivityNotFoundException()
       return if (activityProvider.currentActivity != null) {
         activityProvider.currentActivity
       } else {

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

@@ -30,7 +30,7 @@ class KeepAwakeModule : Module() {
       }
     }
 
-    AsyncFunction("isActivated") {
+    AsyncFunction<Boolean>("isActivated") {
       return@AsyncFunction keepAwakeManager.isActivated
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-keep-awake",
-  "version": "12.8.2",
+  "version": "13.0.1",
   "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": "102899632731658eecba006c0d1c79b98ba8f5f7"
+  "gitHead": "ee4f30ef3b5fa567ad1bf94794197f7683fdd481"
 }