expo-keep-awake 9.2.0 → 10.0.2

package/CHANGELOG.md

@@ -10,6 +10,32 @@
 
 ### 💡 Others
 
+## 10.0.2 — 2022-02-01
+
+### 🐛 Bug fixes
+
+- 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))
+
+## 10.0.1 — 2021-11-17
+
+_This version does not introduce any user-facing changes._
+
+## 10.0.0 — 2021-09-28
+
+### 🛠 Breaking changes
+
+- Dropped support for iOS 11.0 ([#14383](https://github.com/expo/expo/pull/14383) by [@cruzach](https://github.com/cruzach))
+
+### 🐛 Bug fixes
+
+- Fix building errors from use_frameworks! in Podfile. ([#14523](https://github.com/expo/expo/pull/14523) by [@kudo](https://github.com/kudo))
+
+## 9.3.0 — 2021-09-08
+
+### 💡 Others
+
+- Rewrite android code to Kotlin. ([#13996](https://github.com/expo/expo/pull/13996) by [@kkafar](https://github.com/kkafar))
+
 ## 9.2.0 — 2021-06-16
 
 ### 🐛 Bug fixes

package/README.md

@@ -13,7 +13,7 @@ For managed [managed](https://docs.expo.io/versions/latest/introduction/managed-
 
 # Installation in bare React Native projects
 
-For bare React Native projects, you must ensure that you have [installed and configured the `react-native-unimodules` package](https://github.com/expo/expo/tree/master/packages/react-native-unimodules) before continuing.
+For bare React Native projects, you must ensure that you have [installed and configured the `expo` package](https://docs.expo.dev/bare/installing-expo-modules/) before continuing.
 
 ### Add the package to your npm dependencies
 

package/android/build.gradle

@@ -1,9 +1,9 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'maven'
+apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '9.2.0'
+version = '10.0.2'
 
 buildscript {
   // Simple helper that allows the root project to override versions declared by this library.
@@ -20,27 +20,25 @@ buildscript {
   }
 }
 
-// Upload android library to maven with javadoc and android sources
-configurations {
-  deployerJars
-}
-
 // Creating sources with comments
 task androidSourcesJar(type: Jar) {
   classifier = 'sources'
   from android.sourceSets.main.java.srcDirs
 }
 
-// Put the androidSources and javadoc to the artifacts
-artifacts {
-  archives androidSourcesJar
-}
-
-uploadArchives {
-  repositories {
-    mavenDeployer {
-      configuration = configurations.deployerJars
-      repository(url: mavenLocal().url)
+afterEvaluate {
+  publishing {
+    publications {
+      release(MavenPublication) {
+        from components.release
+        // Add additional sourcesJar to artifacts
+        artifact(androidSourcesJar)
+      }
+    }
+    repositories {
+      maven {
+        url = mavenLocal().url
+      }
     }
   }
 }
@@ -53,27 +51,23 @@ android {
     targetCompatibility JavaVersion.VERSION_1_8
   }
 
+  kotlinOptions {
+    jvmTarget = "1.8"
+  }
+
   defaultConfig {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 30)
     versionCode 16
-    versionName "9.2.0"
+    versionName "10.0.2"
   }
   lintOptions {
     abortOnError false
   }
 }
 
-if (new File(rootProject.projectDir.parentFile, 'package.json').exists()) {
-  apply from: project(":unimodules-core").file("../unimodules-core.gradle")
-} else {
-  throw new GradleException(
-      "'unimodules-core.gradle' was not found in the usual React Native dependency location. " +
-          "This package can only be used in such projects. Are you sure you've installed the dependencies properly?")
-}
-
 dependencies {
-  unimodule "unimodules-core"
+  implementation project(':expo-modules-core')
 
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${safeExtGet('kotlinVersion', '1.4.21')}"
 }

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

@@ -0,0 +1,62 @@
+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 java.util.HashSet
+
+class ExpoKeepAwakeManager(private val moduleRegistryDelegate: ModuleRegistryDelegate = ModuleRegistryDelegate()) : KeepAwakeManager, InternalModule {
+  private val tags: MutableSet<String> = HashSet()
+
+  private inline fun <reified T> moduleRegistry() = moduleRegistryDelegate.getFromModuleRegistry<T>()
+
+  override fun onCreate(moduleRegistry: ModuleRegistry) {
+    moduleRegistryDelegate.onCreate(moduleRegistry)
+  }
+
+  @get:Throws(CurrentActivityNotFoundException::class)
+  private val currentActivity: Activity
+    get() {
+      val activityProvider: ActivityProvider by moduleRegistry()
+      return if (activityProvider.currentActivity != null) {
+        activityProvider.currentActivity
+      } else {
+        throw CurrentActivityNotFoundException()
+      }
+    }
+
+  @Throws(CurrentActivityNotFoundException::class)
+  override fun activate(tag: String, done: Runnable) {
+    val activity = currentActivity
+    if (!isActivated) {
+      activity.runOnUiThread { activity.window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) }
+    }
+    tags.add(tag)
+    done.run()
+  }
+
+  @Throws(CurrentActivityNotFoundException::class)
+  override fun deactivate(tag: String, done: Runnable) {
+    val activity = currentActivity
+    if (tags.size == 1 && tags.contains(tag)) {
+      activity.runOnUiThread { activity.window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) }
+    }
+    tags.remove(tag)
+    done.run()
+  }
+
+  override fun isActivated(): Boolean {
+    return tags.isNotEmpty()
+  }
+
+  override fun getExportedInterfaces(): List<Class<*>?> {
+    return listOf(KeepAwakeManager::class.java)
+  }
+}

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

@@ -0,0 +1,54 @@
+// 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
+
+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")
+    }
+  }
+
+  @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.")
+    }
+  }
+
+  val isActivated: Boolean
+    get() = keepAwakeManager.isActivated
+}

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

@@ -0,0 +1,17 @@
+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/build/ExpoKeepAwake.d.ts

@@ -1,2 +1,2 @@
-declare const _default: import("@unimodules/core").ProxyNativeModule;
+declare const _default: import("expo-modules-core").ProxyNativeModule;
 export default _default;

package/build/ExpoKeepAwake.js

@@ -1,3 +1,3 @@
-import { NativeModulesProxy } from '@unimodules/core';
+import { NativeModulesProxy } from 'expo-modules-core';
 export default NativeModulesProxy.ExpoKeepAwake;
 //# sourceMappingURL=ExpoKeepAwake.js.map

package/build/ExpoKeepAwake.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExpoKeepAwake.js","sourceRoot":"","sources":["../src/ExpoKeepAwake.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,eAAe,kBAAkB,CAAC,aAAa,CAAC","sourcesContent":["import { NativeModulesProxy } from '@unimodules/core';\nexport default NativeModulesProxy.ExpoKeepAwake;\n"]}
+{"version":3,"file":"ExpoKeepAwake.js","sourceRoot":"","sources":["../src/ExpoKeepAwake.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,eAAe,kBAAkB,CAAC,aAAa,CAAC","sourcesContent":["import { NativeModulesProxy } from 'expo-modules-core';\nexport default NativeModulesProxy.ExpoKeepAwake;\n"]}

package/ios/EXKeepAwake/EXKeepAwake.h

@@ -1,7 +1,7 @@
 // Copyright 2018-present 650 Industries. All rights reserved.
 
-#import <UMCore/UMExportedModule.h>
-#import <UMCore/UMModuleRegistryConsumer.h>
+#import <ExpoModulesCore/EXExportedModule.h>
+#import <ExpoModulesCore/EXModuleRegistryConsumer.h>
 
-@interface EXKeepAwake : UMExportedModule <UMModuleRegistryConsumer>
+@interface EXKeepAwake : EXExportedModule <EXModuleRegistryConsumer>
 @end

package/ios/EXKeepAwake/EXKeepAwake.m

@@ -1,14 +1,14 @@
 // Copyright 2018-present 650 Industries. All rights reserved.
 
-#import <UMCore/UMModuleRegistry.h>
+#import <ExpoModulesCore/EXModuleRegistry.h>
 #import <EXKeepAwake/EXKeepAwake.h>
-#import <UMCore/UMAppLifecycleService.h>
-#import <UMCore/UMUtilities.h>
+#import <ExpoModulesCore/EXAppLifecycleService.h>
+#import <ExpoModulesCore/EXUtilities.h>
 
-@interface EXKeepAwake () <UMAppLifecycleListener>
+@interface EXKeepAwake () <EXAppLifecycleListener>
 
-@property (nonatomic, weak) id<UMAppLifecycleService> lifecycleManager;
-@property (nonatomic, weak) UMModuleRegistry *moduleRegistry;
+@property (nonatomic, weak) id<EXAppLifecycleService> lifecycleManager;
+@property (nonatomic, weak) EXModuleRegistry *moduleRegistry;
 
 @end
 
@@ -22,11 +22,11 @@
   return self;
 }
 
-UM_EXPORT_MODULE(ExpoKeepAwake);
+EX_EXPORT_MODULE(ExpoKeepAwake);
 
-# pragma mark - UMModuleRegistryConsumer
+# pragma mark - EXModuleRegistryConsumer
 
-- (void)setModuleRegistry:(UMModuleRegistry *)moduleRegistry
+- (void)setModuleRegistry:(EXModuleRegistry *)moduleRegistry
 {
   if (_moduleRegistry) {
     [_lifecycleManager unregisterAppLifecycleListener:self];
@@ -35,7 +35,7 @@ UM_EXPORT_MODULE(ExpoKeepAwake);
   _lifecycleManager = nil;
   
   if (moduleRegistry) {
-    _lifecycleManager = [moduleRegistry getModuleImplementingProtocol:@protocol(UMAppLifecycleService)];
+    _lifecycleManager = [moduleRegistry getModuleImplementingProtocol:@protocol(EXAppLifecycleService)];
   }
   
   if (_lifecycleManager) {
@@ -43,12 +43,12 @@ UM_EXPORT_MODULE(ExpoKeepAwake);
   }
 }
 
-UM_EXPORT_METHOD_AS(activate, activate:(NSString *)tag
-                    resolve:(UMPromiseResolveBlock)resolve
-                    reject:(UMPromiseRejectBlock)reject)
+EX_EXPORT_METHOD_AS(activate, activate:(NSString *)tag
+                    resolve:(EXPromiseResolveBlock)resolve
+                    reject:(EXPromiseRejectBlock)reject)
 {
   if(![self shouldBeActive]) {
-    [UMUtilities performSynchronouslyOnMainThread:^{
+    [EXUtilities performSynchronouslyOnMainThread:^{
       [[UIApplication sharedApplication] setIdleTimerDisabled:YES];
     }];
   }
@@ -56,30 +56,30 @@ UM_EXPORT_METHOD_AS(activate, activate:(NSString *)tag
   resolve(@YES);
 }
 
-UM_EXPORT_METHOD_AS(deactivate, deactivate:(NSString *)tag
-                    resolve:(UMPromiseResolveBlock)resolve
-                    reject:(UMPromiseRejectBlock)reject)
+EX_EXPORT_METHOD_AS(deactivate, deactivate:(NSString *)tag
+                    resolve:(EXPromiseResolveBlock)resolve
+                    reject:(EXPromiseRejectBlock)reject)
 {
   [_activeTags removeObject:tag];
   if (![self shouldBeActive]) {
-    [UMUtilities performSynchronouslyOnMainThread:^{
+    [EXUtilities performSynchronouslyOnMainThread:^{
       [[UIApplication sharedApplication] setIdleTimerDisabled:NO];
     }];
   }
   resolve(@YES);
 }
 
-# pragma mark - UMAppLifecycleListener
+# pragma mark - EXAppLifecycleListener
 
 - (void)onAppBackgrounded {
-  [UMUtilities performSynchronouslyOnMainThread:^{
+  [EXUtilities performSynchronouslyOnMainThread:^{
     [[UIApplication sharedApplication] setIdleTimerDisabled:NO];
   }];
 }
 
 - (void)onAppForegrounded {
   if ([self shouldBeActive]) {
-    [UMUtilities performSynchronouslyOnMainThread:^{
+    [EXUtilities performSynchronouslyOnMainThread:^{
       [[UIApplication sharedApplication] setIdleTimerDisabled:YES];
     }];
   }

package/ios/EXKeepAwake.podspec

@@ -10,10 +10,11 @@ Pod::Spec.new do |s|
   s.license        = package['license']
   s.author         = package['author']
   s.homepage       = package['homepage']
-  s.platform       = :ios, '11.0'
+  s.platform       = :ios, '12.0'
   s.source         = { git: 'https://github.com/expo/expo.git' }
+  s.static_framework = true
 
-  s.dependency 'UMCore'
+  s.dependency 'ExpoModulesCore'
 
   if !$ExpoUseSources&.include?(package['name']) && ENV['EXPO_USE_SOURCE'].to_i == 0 && File.exist?("#{s.name}.xcframework") && Gem::Version.new(Pod::VERSION) >= Gem::Version.new('1.10.0')
     s.source_files = "#{s.name}/**/*.h"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-keep-awake",
-  "version": "9.2.0",
+  "version": "10.0.2",
   "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",
@@ -30,9 +30,13 @@
   },
   "author": "650 Industries, Inc.",
   "license": "MIT",
-  "homepage": "https://docs.expo.io/versions/latest/sdk/keep-awake/",
+  "homepage": "https://docs.expo.dev/versions/latest/sdk/keep-awake/",
+  "dependencies": {},
   "devDependencies": {
     "expo-module-scripts": "^2.0.0"
   },
-  "gitHead": "b33f5e224578564c3e4b1b467f258cc119b3b786"
+  "peerDependencies": {
+    "expo": "*"
+  },
+  "gitHead": "ba24eba18bf4f4d4b0d54828992d81a2bb18246a"
 }

package/src/ExpoKeepAwake.ts

@@ -1,2 +1,2 @@
-import { NativeModulesProxy } from '@unimodules/core';
+import { NativeModulesProxy } from 'expo-modules-core';
 export default NativeModulesProxy.ExpoKeepAwake;

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

@@ -1,69 +0,0 @@
-package expo.modules.keepawake;
-
-import android.app.Activity;
-import android.view.WindowManager;
-
-import org.unimodules.core.ModuleRegistry;
-import org.unimodules.core.errors.CurrentActivityNotFoundException;
-import org.unimodules.core.interfaces.ActivityProvider;
-import org.unimodules.core.interfaces.InternalModule;
-import org.unimodules.core.interfaces.services.KeepAwakeManager;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-public class ExpoKeepAwakeManager implements KeepAwakeManager, InternalModule {
-
-  private ModuleRegistry mModuleRegistry;
-  private Set<String> mTags = new HashSet<>();
-
-  @Override
-  public void onCreate(ModuleRegistry moduleRegistry) {
-    mModuleRegistry = moduleRegistry;
-  }
-
-  private Activity getCurrentActivity() throws CurrentActivityNotFoundException {
-    ActivityProvider activityProvider = mModuleRegistry.getModule(ActivityProvider.class);
-    if (activityProvider.getCurrentActivity() != null) {
-      return activityProvider.getCurrentActivity();
-    } else {
-      throw new CurrentActivityNotFoundException();
-    }
-  }
-
-  @Override
-  public void activate(final String tag, final Runnable done) throws CurrentActivityNotFoundException {
-    final Activity activity = getCurrentActivity();
-
-    if (!isActivated()) {
-      if (activity != null) {
-        activity.runOnUiThread(() -> activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON));
-      }
-    }
-    mTags.add(tag);
-    done.run();
-  }
-
-  @Override
-  public void deactivate(final String tag, final Runnable done) throws CurrentActivityNotFoundException {
-    final Activity activity = getCurrentActivity();
-
-    if (mTags.size() == 1 && mTags.contains(tag) && activity != null) {
-      activity.runOnUiThread(() -> activity.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON));
-    }
-    mTags.remove(tag);
-    done.run();
-  }
-
-  @Override
-  public boolean isActivated() {
-    return mTags.size() > 0;
-  }
-
-  @Override
-  public List<? extends Class> getExportedInterfaces() {
-    return Collections.singletonList(KeepAwakeManager.class);
-  }
-}

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

@@ -1,57 +0,0 @@
-// Copyright 2015-present 650 Industries. All rights reserved.
-
-package expo.modules.keepawake;
-
-import android.content.Context;
-
-import org.unimodules.core.ExportedModule;
-import org.unimodules.core.ModuleRegistry;
-import org.unimodules.core.Promise;
-import org.unimodules.core.errors.CurrentActivityNotFoundException;
-import org.unimodules.core.interfaces.ExpoMethod;
-import org.unimodules.core.interfaces.services.KeepAwakeManager;
-
-public class KeepAwakeModule extends ExportedModule {
-  private static final String NAME = "ExpoKeepAwake";
-  private final static String NO_ACTIVITY_ERROR_CODE = "NO_CURRENT_ACTIVITY";
-
-  private KeepAwakeManager mKeepAwakeManager;
-
-  public KeepAwakeModule(Context context) {
-    super(context);
-  }
-
-  @Override
-  public String getName() {
-    return NAME;
-  }
-
-  @Override
-  public void onCreate(ModuleRegistry moduleRegistry) {
-    mKeepAwakeManager = moduleRegistry.getModule(KeepAwakeManager.class);
-  }
-
-
-  @ExpoMethod
-  public void activate(String tag, final Promise promise) {
-    try {
-      mKeepAwakeManager.activate(tag, () -> promise.resolve(true));
-    } catch (CurrentActivityNotFoundException ex) {
-      promise.reject(NO_ACTIVITY_ERROR_CODE, "Unable to activate keep awake");
-    }
-  }
-
-  @ExpoMethod
-  public void deactivate(String tag, Promise promise) {
-    try {
-      mKeepAwakeManager.deactivate(tag, () -> promise.resolve(true));
-    } catch (CurrentActivityNotFoundException ex) {
-      promise.reject(NO_ACTIVITY_ERROR_CODE, "Unable to deactivate keep awake. However, it probably is deactivated already.");
-    }
-
-  }
-
-  public boolean isActivated() {
-    return mKeepAwakeManager.isActivated();
-  }
-}

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

@@ -1,23 +0,0 @@
-package expo.modules.keepawake;
-
-import android.content.Context;
-
-import org.unimodules.core.ExportedModule;
-import org.unimodules.core.interfaces.InternalModule;
-import org.unimodules.core.interfaces.Package;
-
-import java.util.Collections;
-import java.util.List;
-
-public class KeepAwakePackage implements Package {
-
-  @Override
-  public List<ExportedModule> createExportedModules(Context context) {
-    return Collections.<ExportedModule>singletonList(new KeepAwakeModule(context));
-  }
-
-  @Override
-  public List<? extends InternalModule> createInternalModules(Context context) {
-    return Collections.singletonList(new ExpoKeepAwakeManager());
-  }
-}