expo-device 5.9.4 → 6.0.1

package/CHANGELOG.md

@@ -10,21 +10,30 @@
 
 ### 💡 Others
 
-## 5.9.4 — 2024-04-15
+## 6.0.1 — 2024-04-23
+
+_This version does not introduce any user-facing changes._
+
+## 6.0.0 — 2024-04-18
+
+### 🐛 Bug fixes
+
+- `Device.productName` now returns `Build.PRODUCT` instead of `Build.DEVICE`. ([#27230](https://github.com/expo/expo/pull/27230) by [@alex-fournier](https://github.com/alex-fournier))
 
 ### 💡 Others
 
 - [iOS] Add privacy manifest describing required reason API usage. ([#27770](https://github.com/expo/expo/pull/27770) by [@aleqsio](https://github.com/aleqsio))
+- Removed deprecated backward compatible Gradle settings. ([#28083](https://github.com/expo/expo/pull/28083) by [@kudo](https://github.com/kudo))
 
-## 5.9.3 — 2024-01-18
+## 5.9.3 - 2024-01-18
 
 _This version does not introduce any user-facing changes._
 
-## 5.9.2 — 2024-01-10
+## 5.9.2 - 2024-01-10
 
 _This version does not introduce any user-facing changes._
 
-## 5.9.1 — 2023-12-19
+## 5.9.1 - 2023-12-19
 
 _This version does not introduce any user-facing changes._
 

package/android/build.gradle

@@ -1,111 +1,24 @@
 apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '5.9.4'
+version = '6.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.device"
   defaultConfig {
     versionCode 12
-    versionName '5.9.4'
+    versionName '6.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()}"
-  }
-
   api 'com.facebook.device.yearclass:yearclass:2.1.0'
   api "androidx.legacy:legacy-support-v4:1.0.0"
-
 }

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

@@ -41,7 +41,7 @@ class DeviceModule : Module() {
         "manufacturer" to Build.MANUFACTURER,
         "modelName" to Build.MODEL,
         "designName" to Build.DEVICE,
-        "productName" to Build.DEVICE,
+        "productName" to Build.PRODUCT,
         "deviceYearClass" to deviceYearClass,
         "totalMemory" to run {
           val memoryInfo = ActivityManager.MemoryInfo()
@@ -66,20 +66,20 @@ class DeviceModule : Module() {
       )
     }
 
-    AsyncFunction("getDeviceTypeAsync") {
+    AsyncFunction<Int>("getDeviceTypeAsync") {
       return@AsyncFunction getDeviceType(context).JSValue
     }
 
-    AsyncFunction("getUptimeAsync") {
+    AsyncFunction<Double>("getUptimeAsync") {
       return@AsyncFunction SystemClock.uptimeMillis().toDouble()
     }
 
-    AsyncFunction("getMaxMemoryAsync") {
+    AsyncFunction<Double>("getMaxMemoryAsync") {
       val maxMemory = Runtime.getRuntime().maxMemory()
-      return@AsyncFunction if (maxMemory != Long.MAX_VALUE) maxMemory.toDouble() else -1
+      return@AsyncFunction if (maxMemory != Long.MAX_VALUE) maxMemory.toDouble() else -1.0
     }
 
-    AsyncFunction("isRootedExperimentalAsync") {
+    AsyncFunction<Boolean>("isRootedExperimentalAsync") {
       val isRooted: Boolean
       val isDevice = !isRunningOnEmulator
 
@@ -97,7 +97,7 @@ class DeviceModule : Module() {
       return@AsyncFunction isRooted
     }
 
-    AsyncFunction("isSideLoadingEnabledAsync") {
+    AsyncFunction<Boolean>("isSideLoadingEnabledAsync") {
       return@AsyncFunction if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
         Settings.Global.getInt(
           context.applicationContext.contentResolver,
@@ -109,7 +109,7 @@ class DeviceModule : Module() {
       }
     }
 
-    AsyncFunction("getPlatformFeaturesAsync") {
+    AsyncFunction<List<String>>("getPlatformFeaturesAsync") {
       val allFeatures = context.applicationContext.packageManager.systemAvailableFeatures
       return@AsyncFunction allFeatures.filterNotNull().map { it.name }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-device",
-  "version": "5.9.4",
+  "version": "6.0.1",
   "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": "88a8226609b870c0635c39da43ac8306c4dc7031"
+  "gitHead": "ee4f30ef3b5fa567ad1bf94794197f7683fdd481"
 }