expo-device 5.7.0 → 5.8.0

package/CHANGELOG.md

@@ -10,6 +10,20 @@
 
 ### 💡 Others
 
+## 5.8.0 — 2023-10-17
+
+### 🛠 Breaking changes
+
+- Dropped support for Android SDK 21 and 22. ([#24201](https://github.com/expo/expo/pull/24201) by [@behenate](https://github.com/behenate))
+
+### 🎉 New features
+
+- Added new devices for iOS. ([#24555](https://github.com/expo/expo/pull/24555) by [@johanholm](https://github.com/johanholm))
+
+### 🐛 Bug fixes
+
+- [iOS] fix tvOS compilation. ([#24845](https://github.com/expo/expo/pull/24845) by [@douglowder](https://github.com/douglowder))
+
 ## 5.7.0 — 2023-09-15
 
 ### 🎉 New features

package/android/build.gradle

@@ -3,15 +3,20 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '5.7.0'
+version = '5.8.0'
 
-buildscript {
-  def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
-  if (expoModulesCorePlugin.exists()) {
-    apply from: expoModulesCorePlugin
-    applyKotlinExpoModulesCorePlugin()
+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
@@ -35,23 +40,44 @@ buildscript {
   }
 }
 
-afterEvaluate {
-  publishing {
-    publications {
-      release(MavenPublication) {
-        from components.release
+// 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
+      repositories {
+        maven {
+          url = mavenLocal().url
+        }
       }
     }
   }
 }
 
 android {
-  compileSdkVersion safeExtGet("compileSdkVersion", 33)
+  // Remove this if and it's contents, when support for SDK49 is dropped
+  if (!safeExtGet("expoProvidesDefaultConfig", false)) {
+    compileSdkVersion safeExtGet("compileSdkVersion", 33)
+
+    defaultConfig {
+      minSdkVersion safeExtGet("minSdkVersion", 23)
+      targetSdkVersion safeExtGet("targetSdkVersion", 33)
+    }
+
+    publishing {
+      singleVariant("release") {
+        withSourcesJar()
+      }
+    }
+
+    lintOptions {
+      abortOnError false
+    }
+  }
 
   def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION
   if (agpVersion.tokenize('.')[0].toInteger() < 8) {
@@ -67,26 +93,19 @@ android {
 
   namespace "expo.modules.device"
   defaultConfig {
-    minSdkVersion safeExtGet("minSdkVersion", 21)
-    targetSdkVersion safeExtGet("targetSdkVersion", 33)
     versionCode 12
-    versionName '5.7.0'
-  }
-  lintOptions {
-    abortOnError false
-  }
-  publishing {
-    singleVariant("release") {
-      withSourcesJar()
-    }
+    versionName '5.8.0'
   }
 }
 
 dependencies {
-  implementation project(':expo-modules-core')
+  // 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()}"
+  }
 
   api 'com.facebook.device.yearclass:yearclass:2.1.0'
   api "androidx.legacy:legacy-support-v4:1.0.0"
 
-  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${getKotlinVersion()}"
 }

package/android/src/main/java/expo/modules/device/DeviceModule.kt

@@ -123,11 +123,7 @@ class DeviceModule : Module() {
 
   private val systemName: String
     get() {
-      return if (Build.VERSION.SDK_INT < 23) {
-        "Android"
-      } else {
-        Build.VERSION.BASE_OS.takeIf { it.isNotEmpty() } ?: "Android"
-      }
+      return Build.VERSION.BASE_OS.takeIf { it.isNotEmpty() } ?: "Android"
     }
 
   companion object {

package/ios/DeviceModule.swift

@@ -44,7 +44,7 @@ func getDeviceType() -> Int {
   }
 
   // if it's built for iPad running on a Mac
-  if #available(iOS 14.0, *) {
+  if #available(iOS 14.0, tvOS 14.0, *) {
     if ProcessInfo.processInfo.isiOSAppOnMac {
       return DeviceType.desktop.rawValue
     }

package/ios/ExpoDevice.podspec

@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
   s.license        = package['license']
   s.author         = package['author']
   s.homepage       = package['homepage']
-  s.platform       = :ios, '13.0'
+  s.platforms      = { :ios => '13.0', :tvos => '13.0' }
   s.swift_version  = '5.4'
   s.source         = { git: 'https://github.com/expo/expo.git' }
   s.static_framework = true

package/ios/UIDevice.swift

@@ -86,6 +86,14 @@ public extension UIDevice {
         return ExpoDeviceType(modelName: "iPhone 14 Pro", deviceYearClass: 2022)
       case "iPhone15,3":
         return ExpoDeviceType(modelName: "iPhone 14 Pro Max", deviceYearClass: 2022)
+      case "iPhone15,4":
+        return ExpoDeviceType(modelName: "iPhone 15", deviceYearClass: 2023)
+      case "iPhone15,5":
+        return ExpoDeviceType(modelName: "iPhone 15 Plus", deviceYearClass: 2023)
+      case "iPhone16,1":
+        return ExpoDeviceType(modelName: "iPhone 15 Pro", deviceYearClass: 2023)
+      case "iPhone16,2":
+        return ExpoDeviceType(modelName: "iPhone 15 Pro Max", deviceYearClass: 2023)
       case "iPhone8,4":
         return ExpoDeviceType(modelName: "iPhone SE", deviceYearClass: 2016)
       case "iPhone12,8":
@@ -102,6 +110,8 @@ public extension UIDevice {
         return ExpoDeviceType(modelName: "iPad (8th generation)", deviceYearClass: 2020)
       case "iPad12,1", "iPad12,2":
         return ExpoDeviceType(modelName: "iPad (9th generation)", deviceYearClass: 2021)
+      case "iPad13,18", "iPad13,19":
+        return ExpoDeviceType(modelName: "iPad (10th generation)", deviceYearClass: 2022)
       case "iPad4,1", "iPad4,2", "iPad4,3":
         return ExpoDeviceType(modelName: "iPad Air", deviceYearClass: 2013)
       case "iPad5,3", "iPad5,4":
@@ -132,6 +142,8 @@ public extension UIDevice {
         return ExpoDeviceType(modelName: "iPad Pro (11-inch) (2nd generation)", deviceYearClass: 2020)
       case "iPad13,4", "iPad13,5", "iPad13,6", "iPad13,7":
         return ExpoDeviceType(modelName: "iPad Pro (11-inch) (3rd generation)", deviceYearClass: 2021)
+      case "iPad14,3-A", "iPad14,3-B", "iPad14,4-A", "iPad14,4-B":
+        return ExpoDeviceType(modelName: "iPad Pro (11-inch) (4rd generation)", deviceYearClass: 2022)
       case "iPad6,7", "iPad6,8":
         return ExpoDeviceType(modelName: "iPad Pro (12.9-inch) (1st generation)", deviceYearClass: 2015)
       case "iPad7,1", "iPad7,2":
@@ -142,6 +154,8 @@ public extension UIDevice {
         return ExpoDeviceType(modelName: "iPad Pro (12.9-inch) (4th generation)", deviceYearClass: 2020)
       case "iPad13,8", "iPad13,9", "iPad13,10", "iPad13,11":
         return ExpoDeviceType(modelName: "iPad Pro (12.9-inch) (5th generation)", deviceYearClass: 2021)
+      case "iPad14,5-A", "iPad14,5-B", "iPad14,6-A", "iPad14,6-B":
+        return ExpoDeviceType(modelName: "iPad Pro (12.9-inch) (6th generation)", deviceYearClass: 2022)
       case "AppleTV5,3":
         return ExpoDeviceType(modelName: "Apple TV HD (4th Generation, Siri)", deviceYearClass: 2015)
       case "AppleTV6,2":
@@ -160,7 +174,7 @@ public extension UIDevice {
       case "i386", "x86_64":
         return ExpoDeviceType(modelName: "Simulator tvOS", deviceYearClass: currentYear)
       default:
-        return identifier
+        return ExpoDeviceType(modelName: identifier, deviceYearClass: currentYear)
       }
 #endif
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-device",
-  "version": "5.7.0",
+  "version": "5.8.0",
   "description": "A universal module that gets physical information about the device running the application",
   "main": "build/Device.js",
   "types": "build/Device.d.ts",
@@ -41,5 +41,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "ee2c866ba3c7fbc35ff2a3e896041cf15d3bd7c5"
+  "gitHead": "da25937e2a99661cbe5eb60ca1d8d6245fc96a50"
 }