expo-system-ui 2.9.4 → 3.0.1

package/CHANGELOG.md

@@ -10,19 +10,27 @@
 
 ### 💡 Others
 
-## 2.9.4 — 2024-04-15
+## 3.0.1 — 2024-04-22
+
+_This version does not introduce any user-facing changes._
+
+## 3.0.0 — 2024-04-18
 
 ### 💡 Others
 
 - [iOS] Add privacy manifest describing required reason API usage. ([#27770](https://github.com/expo/expo/pull/27770) by [@aleqsio](https://github.com/aleqsio))
+- Use `typeof window` checks for removing server code. ([#27514](https://github.com/expo/expo/pull/27514) by [@EvanBacon](https://github.com/EvanBacon))
+- drop unused web `name` property. ([#27437](https://github.com/expo/expo/pull/27437) by [@EvanBacon](https://github.com/EvanBacon))
+- Migrated dependency from `@react-native/normalize-color` to `@react-native/normalize-colors`. ([#27736](https://github.com/expo/expo/pull/27736) by [@kudo](https://github.com/kudo))
+- Removed deprecated backward compatible Gradle settings. ([#28083](https://github.com/expo/expo/pull/28083) by [@kudo](https://github.com/kudo))
 
-## 2.9.3 — 2024-01-10
+## 2.9.3 - 2024-01-10
 
 ### 💡 Others
 
 - Replace deprecated `com.facebook.react:react-native:+` Android dependency with `com.facebook.react:react-android`. ([#26237](https://github.com/expo/expo/pull/26237) by [@kudo](https://github.com/kudo))
 
-## 2.9.2 — 2023-12-19
+## 2.9.2 - 2023-12-19
 
 _This version does not introduce any user-facing changes._
 

package/android/build.gradle

@@ -1,110 +1,24 @@
 apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '2.9.4'
+version = '3.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.systemui"
   defaultConfig {
     versionCode 1
-    versionName '2.9.4'
+    versionName '3.0.1'
   }
 }
 
 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()}"
-  }
-
   implementation 'com.facebook.react:react-android'
   implementation 'androidx.core:core:1.6.0'
   implementation 'androidx.appcompat:appcompat:1.2.0'

package/android/src/main/java/expo/modules/systemui/SystemUIModule.kt

@@ -50,7 +50,7 @@ class SystemUIModule : Module() {
       setBackgroundColor(color ?: systemBackgroundColor)
     }.runOnQueue(Queues.MAIN)
 
-    AsyncFunction("getBackgroundColorAsync") {
+    AsyncFunction<String?>("getBackgroundColorAsync") {
       val background = currentActivity.window.decorView.background
       return@AsyncFunction if (background is ColorDrawable) {
         colorToHex((background.mutate() as ColorDrawable).color)

package/android/src/main/java/expo/modules/systemui/SystemUIReactActivityLifecycleListener.kt

@@ -6,8 +6,6 @@ import android.os.Bundle
 import expo.modules.core.interfaces.ReactActivityLifecycleListener
 import expo.modules.systemui.singletons.SystemUI
 
-// EXPO_VERSIONING_NEEDS_PACKAGE_R
-
 class SystemUIReactActivityLifecycleListener(activityContext: Context) : ReactActivityLifecycleListener {
   override fun onCreate(activity: Activity, savedInstanceState: Bundle?) {
     SystemUI.setUserInterfaceStyle(getUserInterfaceStyle(activity))

package/build/ExpoSystemUI.web.d.ts

@@ -1,5 +1,4 @@
 declare const _default: {
-    readonly name: string;
     getBackgroundColorAsync(): any;
     setBackgroundColorAsync(color: string | null): void;
 };

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

@@ -1 +1 @@
-{"version":3,"file":"ExpoSystemUI.web.d.ts","sourceRoot":"","sources":["../src/ExpoSystemUI.web.ts"],"names":[],"mappings":";;;mCAeiC,MAAM,GAAG,IAAI;;AAX9C,wBAgBE"}
+{"version":3,"file":"ExpoSystemUI.web.d.ts","sourceRoot":"","sources":["../src/ExpoSystemUI.web.ts"],"names":[],"mappings":";;mCAQiC,MAAM,GAAG,IAAI;;AAR9C,wBAaE"}

package/build/ExpoSystemUI.web.js

@@ -1,20 +1,13 @@
-import { Platform } from 'expo-modules-core';
-// @ts-ignore: untyped
-import normalizeColor from 'react-native-web/dist/cjs/modules/normalizeColor';
 export default {
-    get name() {
-        return 'ExpoSystemUI';
-    },
     getBackgroundColorAsync() {
-        if (Platform.isDOMAvailable) {
-            return normalizeColor(document.body.style.backgroundColor);
-        }
-        else {
+        if (typeof window === 'undefined') {
             return null;
         }
+        const normalizeColor = require('react-native-web/dist/cjs/modules/normalizeColor');
+        return normalizeColor(document.body.style.backgroundColor);
     },
     setBackgroundColorAsync(color) {
-        if (Platform.isDOMAvailable) {
+        if (typeof window !== 'undefined') {
             document.body.style.backgroundColor = color ?? 'white';
         }
     },

package/build/ExpoSystemUI.web.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExpoSystemUI.web.js","sourceRoot":"","sources":["../src/ExpoSystemUI.web.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,sBAAsB;AACtB,OAAO,cAAc,MAAM,kDAAkD,CAAC;AAE9E,eAAe;IACb,IAAI,IAAI;QACN,OAAO,cAAc,CAAC;IACxB,CAAC;IACD,uBAAuB;QACrB,IAAI,QAAQ,CAAC,cAAc,EAAE;YAC3B,OAAO,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;SAC5D;aAAM;YACL,OAAO,IAAI,CAAC;SACb;IACH,CAAC;IACD,uBAAuB,CAAC,KAAoB;QAC1C,IAAI,QAAQ,CAAC,cAAc,EAAE;YAC3B,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,eAAe,GAAG,KAAK,IAAI,OAAO,CAAC;SACxD;IACH,CAAC;CACF,CAAC","sourcesContent":["import { Platform } from 'expo-modules-core';\n// @ts-ignore: untyped\nimport normalizeColor from 'react-native-web/dist/cjs/modules/normalizeColor';\n\nexport default {\n  get name(): string {\n    return 'ExpoSystemUI';\n  },\n  getBackgroundColorAsync() {\n    if (Platform.isDOMAvailable) {\n      return normalizeColor(document.body.style.backgroundColor);\n    } else {\n      return null;\n    }\n  },\n  setBackgroundColorAsync(color: string | null) {\n    if (Platform.isDOMAvailable) {\n      document.body.style.backgroundColor = color ?? 'white';\n    }\n  },\n};\n"]}
+{"version":3,"file":"ExpoSystemUI.web.js","sourceRoot":"","sources":["../src/ExpoSystemUI.web.ts"],"names":[],"mappings":"AAAA,eAAe;IACb,uBAAuB;QACrB,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE;YACjC,OAAO,IAAI,CAAC;SACb;QACD,MAAM,cAAc,GAAG,OAAO,CAAC,kDAAkD,CAAC,CAAC;QACnF,OAAO,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;IAC7D,CAAC;IACD,uBAAuB,CAAC,KAAoB;QAC1C,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE;YACjC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,eAAe,GAAG,KAAK,IAAI,OAAO,CAAC;SACxD;IACH,CAAC;CACF,CAAC","sourcesContent":["export default {\n  getBackgroundColorAsync() {\n    if (typeof window === 'undefined') {\n      return null;\n    }\n    const normalizeColor = require('react-native-web/dist/cjs/modules/normalizeColor');\n    return normalizeColor(document.body.style.backgroundColor);\n  },\n  setBackgroundColorAsync(color: string | null) {\n    if (typeof window !== 'undefined') {\n      document.body.style.backgroundColor = color ?? 'white';\n    }\n  },\n};\n"]}

package/ios/ExpoSystemUI.podspec

@@ -24,6 +24,7 @@ Pod::Spec.new do |s|
 
   s.resource_bundles = {'ExpoSystemUI_privacy' => ['PrivacyInfo.xcprivacy']}
 
+
   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.vendored_frameworks = "#{s.name}.xcframework"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-system-ui",
-  "version": "2.9.4",
+  "version": "3.0.1",
   "description": "Interact with system UI elements",
   "main": "build/SystemUI.js",
   "types": "build/SystemUI.d.ts",
@@ -32,7 +32,7 @@
   "license": "MIT",
   "homepage": "https://docs.expo.dev/versions/latest/sdk/system-ui",
   "dependencies": {
-    "@react-native/normalize-color": "^2.0.0",
+    "@react-native/normalize-colors": "~0.74.81",
     "debug": "^4.3.2"
   },
   "jest": {
@@ -44,5 +44,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "88a8226609b870c0635c39da43ac8306c4dc7031"
+  "gitHead": "0897aeadb926491a457bcd67d83360956994ee82"
 }

package/plugin/build/withIosRootViewBackgroundColor.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRootViewBackgroundColor = exports.setRootViewBackgroundColor = exports.withIosRootViewBackgroundColor = void 0;
 // @ts-ignore: uses flow
-const normalize_color_1 = __importDefault(require("@react-native/normalize-color"));
+const normalize_colors_1 = __importDefault(require("@react-native/normalize-colors"));
 const config_plugins_1 = require("expo/config-plugins");
 // Maps to the template AppDelegate.m
 const BACKGROUND_COLOR_KEY = 'RCTRootViewBackgroundColor';
@@ -24,7 +24,7 @@ function setRootViewBackgroundColor(config, infoPlist) {
         delete infoPlist[BACKGROUND_COLOR_KEY];
     }
     else {
-        let color = (0, normalize_color_1.default)(backgroundColor);
+        let color = (0, normalize_colors_1.default)(backgroundColor);
         if (!color) {
             throw new Error('Invalid background color on iOS');
         }

package/plugin/src/withIosRootViewBackgroundColor.ts

@@ -1,5 +1,5 @@
 // @ts-ignore: uses flow
-import normalizeColor from '@react-native/normalize-color';
+import normalizeColor from '@react-native/normalize-colors';
 import { ExpoConfig } from 'expo/config';
 import { ConfigPlugin, InfoPlist, withInfoPlist } from 'expo/config-plugins';
 

package/src/ExpoSystemUI.web.ts

@@ -1,20 +1,13 @@
-import { Platform } from 'expo-modules-core';
-// @ts-ignore: untyped
-import normalizeColor from 'react-native-web/dist/cjs/modules/normalizeColor';
-
 export default {
-  get name(): string {
-    return 'ExpoSystemUI';
-  },
   getBackgroundColorAsync() {
-    if (Platform.isDOMAvailable) {
-      return normalizeColor(document.body.style.backgroundColor);
-    } else {
+    if (typeof window === 'undefined') {
       return null;
     }
+    const normalizeColor = require('react-native-web/dist/cjs/modules/normalizeColor');
+    return normalizeColor(document.body.style.backgroundColor);
   },
   setBackgroundColorAsync(color: string | null) {
-    if (Platform.isDOMAvailable) {
+    if (typeof window !== 'undefined') {
       document.body.style.backgroundColor = color ?? 'white';
     }
   },