expo-keep-awake 10.0.2 → 10.1.0

package/CHANGELOG.md

@@ -10,7 +10,17 @@
 
 ### 💡 Others
 
-## 10.0.2 — 2022-02-01
+## 10.1.0 — 2022-04-18
+
+### 🎉 New features
+
+- Native module on iOS is now written in Swift using the new API. ([#15705](https://github.com/expo/expo/pull/15705) by [@tsapeta](https://github.com/tsapeta))
+
+### ⚠️ Notices
+
+- On Android bump `compileSdkVersion` to `31`, `targetSdkVersion` to `31` and `Java` version to `11`. ([#16941](https://github.com/expo/expo/pull/16941) by [@bbarthec](https://github.com/bbarthec))
+
+## 10.0.2 - 2022-02-01
 
 ### 🐛 Bug fixes
 

package/README.md

@@ -4,12 +4,12 @@ Provides a React component that prevents the screen sleeping when rendered. It a
 
 # API documentation
 
-- [Documentation for the master branch](https://github.com/expo/expo/blob/master/docs/pages/versions/unversioned/sdk/keep-awake.md)
-- [Documentation for the latest stable release](https://docs.expo.io/versions/latest/sdk/keep-awake/)
+- [Documentation for the main branch](https://github.com/expo/expo/blob/main/docs/pages/versions/unversioned/sdk/keep-awake.md)
+- [Documentation for the latest stable release](https://docs.expo.dev/versions/latest/sdk/keep-awake/)
 
 # Installation in managed Expo projects
 
-For managed [managed](https://docs.expo.io/versions/latest/introduction/managed-vs-bare/) Expo projects, please follow the installation instructions in the [API documentation for the latest stable release](https://docs.expo.io/versions/latest/sdk/keep-awake/).
+For [managed](https://docs.expo.dev/versions/latest/introduction/managed-vs-bare/) Expo projects, please follow the installation instructions in the [API documentation for the latest stable release](https://docs.expo.dev/versions/latest/sdk/keep-awake/).
 
 # Installation in bare React Native projects
 

package/android/build.gradle

@@ -3,20 +3,35 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '10.0.2'
+version = '10.1.0'
 
 buildscript {
+  def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
+  if (expoModulesCorePlugin.exists()) {
+    apply from: expoModulesCorePlugin
+    applyKotlinExpoModulesCorePlugin()
+  }
+
   // 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.6.10")
+    }
+  }
+
   repositories {
     mavenCentral()
   }
 
   dependencies {
-    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${safeExtGet('kotlinVersion', '1.4.21')}")
+    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${getKotlinVersion()}")
   }
 }
 
@@ -44,22 +59,22 @@ afterEvaluate {
 }
 
 android {
-  compileSdkVersion safeExtGet("compileSdkVersion", 30)
+  compileSdkVersion safeExtGet("compileSdkVersion", 31)
 
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+    sourceCompatibility JavaVersion.VERSION_11
+    targetCompatibility JavaVersion.VERSION_11
   }
 
   kotlinOptions {
-    jvmTarget = "1.8"
+    jvmTarget = JavaVersion.VERSION_11.majorVersion
   }
 
   defaultConfig {
     minSdkVersion safeExtGet("minSdkVersion", 21)
-    targetSdkVersion safeExtGet("targetSdkVersion", 30)
+    targetSdkVersion safeExtGet("targetSdkVersion", 31)
     versionCode 16
-    versionName "10.0.2"
+    versionName "10.1.0"
   }
   lintOptions {
     abortOnError false
@@ -69,5 +84,5 @@ android {
 dependencies {
   implementation project(':expo-modules-core')
 
-  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${safeExtGet('kotlinVersion', '1.4.21')}"
+  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${getKotlinVersion()}"
 }

package/build/ExpoKeepAwake.d.ts

@@ -1,2 +1,3 @@
 declare const _default: import("expo-modules-core").ProxyNativeModule;
 export default _default;
+//# sourceMappingURL=ExpoKeepAwake.d.ts.map

package/build/ExpoKeepAwake.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ExpoKeepAwake.d.ts","sourceRoot":"","sources":["../src/ExpoKeepAwake.ts"],"names":[],"mappings":";AACA,wBAAgD"}

package/build/ExpoKeepAwake.web.d.ts

@@ -1,2 +1,3 @@
 declare const _default: {};
 export default _default;
+//# sourceMappingURL=ExpoKeepAwake.web.d.ts.map

package/build/ExpoKeepAwake.web.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ExpoKeepAwake.web.d.ts","sourceRoot":"","sources":["../src/ExpoKeepAwake.web.ts"],"names":[],"mappings":";AAAA,wBAAkB"}

package/build/index.d.ts

@@ -22,3 +22,4 @@ export declare function activateKeepAwake(tag?: string): void;
  * the default tag is used.
  */
 export declare function deactivateKeepAwake(tag?: string): void;
+//# sourceMappingURL=index.d.ts.map

package/build/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAOA;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,GAAG,GAAE,MAAyB,GAAG,IAAI,CAKjE;AAGD;;;;;;;GAOG;AAEH,wBAAgB,iBAAiB,CAAC,GAAG,GAAE,MAAyB,GAAG,IAAI,CAEtE;AAGD;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,GAAE,MAAyB,GAAG,IAAI,CAExE"}

package/expo-module.config.json

@@ -0,0 +1,6 @@
+{
+  "platforms": ["ios", "android"],
+  "ios": {
+    "modulesClassNames": ["KeepAwakeModule"]
+  }
+}

package/ios/{EXKeepAwake.podspec → ExpoKeepAwake.podspec}

@@ -3,7 +3,7 @@ require 'json'
 package = JSON.parse(File.read(File.join(__dir__, '..', 'package.json')))
 
 Pod::Spec.new do |s|
-  s.name           = 'EXKeepAwake'
+  s.name           = 'ExpoKeepAwake'
   s.version        = package['version']
   s.summary        = package['description']
   s.description    = package['description']
@@ -11,15 +11,22 @@ Pod::Spec.new do |s|
   s.author         = package['author']
   s.homepage       = package['homepage']
   s.platform       = :ios, '12.0'
+  s.swift_version  = '5.4'
   s.source         = { git: 'https://github.com/expo/expo.git' }
   s.static_framework = true
 
   s.dependency 'ExpoModulesCore'
 
+  # Swift/Objective-C compatibility
+  s.pod_target_xcconfig = {
+    'DEFINES_MODULE' => 'YES',
+    'SWIFT_COMPILATION_MODE' => 'wholemodule'
+  }
+
   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"
+    s.source_files = "**/*.h"
     s.vendored_frameworks = "#{s.name}.xcframework"
   else
-    s.source_files = "#{s.name}/**/*.{h,m}"
+    s.source_files = "**/*.{h,m,swift}"
   end
 end

package/ios/KeepAwakeModule.swift

@@ -0,0 +1,54 @@
+// Copyright 2021-present 650 Industries. All rights reserved.
+
+import ExpoModulesCore
+
+public final class KeepAwakeModule: Module {
+  private var activeTags = Set<String>()
+
+  public func definition() -> ModuleDefinition {
+    name("ExpoKeepAwake")
+
+    function("activate", activate)
+    function("deactivate", deactivate)
+    function("isActivated", isActivated)
+
+    onAppEntersForeground {
+      if !self.activeTags.isEmpty {
+        setActivated(true)
+      }
+    }
+    onAppEntersBackground {
+      if !self.activeTags.isEmpty {
+        setActivated(false)
+      }
+    }
+  }
+
+  private func activate(tag: String) -> Bool {
+    if activeTags.isEmpty {
+      setActivated(true)
+    }
+    activeTags.insert(tag)
+    return true
+  }
+
+  private func deactivate(tag: String) -> Bool {
+    activeTags.remove(tag)
+    if activeTags.isEmpty {
+      setActivated(false)
+    }
+    return true
+  }
+}
+
+private func isActivated() -> Bool {
+  return DispatchQueue.main.sync {
+    return UIApplication.shared.isIdleTimerDisabled
+  }
+}
+
+private func setActivated(_ activated: Bool) {
+  DispatchQueue.main.async {
+    UIApplication.shared.isIdleTimerDisabled = activated
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-keep-awake",
-  "version": "10.0.2",
+  "version": "10.1.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",
@@ -38,5 +38,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "ba24eba18bf4f4d4b0d54828992d81a2bb18246a"
+  "gitHead": "22dce752354bb429c84851bc4389abe47a766b1f"
 }

package/ios/EXKeepAwake/EXKeepAwake.h

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

package/ios/EXKeepAwake/EXKeepAwake.m

@@ -1,92 +0,0 @@
-// Copyright 2018-present 650 Industries. All rights reserved.
-
-#import <ExpoModulesCore/EXModuleRegistry.h>
-#import <EXKeepAwake/EXKeepAwake.h>
-#import <ExpoModulesCore/EXAppLifecycleService.h>
-#import <ExpoModulesCore/EXUtilities.h>
-
-@interface EXKeepAwake () <EXAppLifecycleListener>
-
-@property (nonatomic, weak) id<EXAppLifecycleService> lifecycleManager;
-@property (nonatomic, weak) EXModuleRegistry *moduleRegistry;
-
-@end
-
-@implementation EXKeepAwake {
-  NSMutableSet *_activeTags;
-}
-
-- (instancetype)init {
-  self = [super init];
-  _activeTags = [NSMutableSet set];
-  return self;
-}
-
-EX_EXPORT_MODULE(ExpoKeepAwake);
-
-# pragma mark - EXModuleRegistryConsumer
-
-- (void)setModuleRegistry:(EXModuleRegistry *)moduleRegistry
-{
-  if (_moduleRegistry) {
-    [_lifecycleManager unregisterAppLifecycleListener:self];
-  }
-  
-  _lifecycleManager = nil;
-  
-  if (moduleRegistry) {
-    _lifecycleManager = [moduleRegistry getModuleImplementingProtocol:@protocol(EXAppLifecycleService)];
-  }
-  
-  if (_lifecycleManager) {
-    [_lifecycleManager registerAppLifecycleListener:self];
-  }
-}
-
-EX_EXPORT_METHOD_AS(activate, activate:(NSString *)tag
-                    resolve:(EXPromiseResolveBlock)resolve
-                    reject:(EXPromiseRejectBlock)reject)
-{
-  if(![self shouldBeActive]) {
-    [EXUtilities performSynchronouslyOnMainThread:^{
-      [[UIApplication sharedApplication] setIdleTimerDisabled:YES];
-    }];
-  }
-  [_activeTags addObject:tag];
-  resolve(@YES);
-}
-
-EX_EXPORT_METHOD_AS(deactivate, deactivate:(NSString *)tag
-                    resolve:(EXPromiseResolveBlock)resolve
-                    reject:(EXPromiseRejectBlock)reject)
-{
-  [_activeTags removeObject:tag];
-  if (![self shouldBeActive]) {
-    [EXUtilities performSynchronouslyOnMainThread:^{
-      [[UIApplication sharedApplication] setIdleTimerDisabled:NO];
-    }];
-  }
-  resolve(@YES);
-}
-
-# pragma mark - EXAppLifecycleListener
-
-- (void)onAppBackgrounded {
-  [EXUtilities performSynchronouslyOnMainThread:^{
-    [[UIApplication sharedApplication] setIdleTimerDisabled:NO];
-  }];
-}
-
-- (void)onAppForegrounded {
-  if ([self shouldBeActive]) {
-    [EXUtilities performSynchronouslyOnMainThread:^{
-      [[UIApplication sharedApplication] setIdleTimerDisabled:YES];
-    }];
-  }
-}
-
-- (BOOL)shouldBeActive {
-  return [_activeTags count] > 0;
-}
-
-@end

package/unimodule.json

@@ -1,4 +0,0 @@
-{
-  "name": "expo-keep-awake",
-  "platforms": ["ios", "android"]
-}