expo-module-template 10.2.0 → 10.5.0

package/$package.json

@@ -5,8 +5,13 @@
   "main": "build/<%- project.name %>.js",
   "types": "build/<%- project.name %>.d.ts",
   "scripts": {
-    "build": "tsc",
-    "lint": "eslint ."
+    "build": "expo-module build",
+    "clean": "expo-module clean",
+    "lint": "expo-module lint",
+    "test": "expo-module test",
+    "prepare": "expo-module prepare",
+    "prepublishOnly": "expo-module prepublishOnly",
+    "expo-module": "expo-module"
   },
   "keywords": ["react-native", "expo", "<%- project.slug %>", "<%- project.name %>"],
   "repository": "<%- repo %>",
@@ -18,7 +23,8 @@
   "homepage": "<%- repo %>#readme",
   "dependencies": {},
   "devDependencies": {
-    "expo-module-scripts": "^2.0.0"
+    "expo-module-scripts": "^2.0.0",
+    "expo-modules-core": "^0.9.0"
   },
   "peerDependencies": {
     "expo": "*"

package/android/build.gradle

@@ -1,68 +1,81 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
-apply plugin: 'maven'
+apply plugin: 'maven-publish'
 
 group = '<%- project.package %>'
-version = '10.2.0'
+version = '<%- project.version %>'
 
 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()}")
   }
 }
 
-// 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
+      }
     }
   }
 }
 
 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 = JavaVersion.VERSION_1_8
+    jvmTarget = JavaVersion.VERSION_11.majorVersion
   }
 
   defaultConfig {
     minSdkVersion safeExtGet("minSdkVersion", 21)
-    targetSdkVersion safeExtGet("targetSdkVersion", 30)
+    targetSdkVersion safeExtGet("targetSdkVersion", 31)
     versionCode 1
-    versionName "10.2.0"
+    versionName "<%- project.version %>"
   }
   lintOptions {
     abortOnError false
@@ -75,5 +88,5 @@ repositories {
 
 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/android/src/main/java/{%= project.package %}/{%- project.name %}Module.kt

@@ -5,18 +5,18 @@ import expo.modules.kotlin.modules.ModuleDefinition
 
 class <%- project.name %>Module : Module() {
   override fun definition() = ModuleDefinition {
-    name("<%- project.name %>")
+    Name("<%- project.name %>")
 
-    function("helloAsync") { options: Map<String, String> ->
+    AsyncFunction("helloAsync") { options: Map<String, String> ->
       println("Hello 👋")
     }
 
-    viewManager {
-      view { context -> 
+    ViewManager {
+      View { context -> 
         <%- project.name %>View(context) 
       }
 
-      prop("name") { view: <%- project.name %>View, prop: String ->
+      Prop("name") { view: <%- project.name %>View, prop: String ->
         println(prop)
       }
     }

package/ios/{%- project.name %}Module.swift

@@ -2,18 +2,18 @@ import ExpoModulesCore
 
 public class <%- project.name %>Module: Module {
   public func definition() -> ModuleDefinition {
-    name("<%- project.name %>")
+    Name("<%- project.name %>")
 
-    function("helloAsync") { (options: [String: String]) in
+    AsyncFunction("helloAsync") { (options: [String: String]) in
       print("Hello 👋")
     }
 
-    viewManager {
-      view {
+    ViewManager {
+      View {
         <%- project.name %>View()
       }
 
-      prop("name") { (view: <%- project.name %>View, prop: String) in
+      Prop("name") { (view: <%- project.name %>View, prop: String) in
         print(prop)
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-module-template",
-  "version": "10.2.0",
+  "version": "10.5.0",
   "description": "ExpoModuleTemplate standalone module",
   "main": "build/ModuleTemplate.js",
   "types": "build/ModuleTemplate.d.ts",
@@ -22,11 +22,7 @@
   "license": "MIT",
   "homepage": "https://docs.expo.dev/versions/latest/sdk/module-template",
   "dependencies": {},
-  "devDependencies": {
-    "expo-module-scripts": "^2.0.0"
-  },
-  "peerDependencies": {
-    "expo": "*"
-  },
-  "gitHead": "c87080dbe1d7cefd66a9f959c090ff1a2d2ab26d"
+  "devDependencies": {},
+  "peerDependencies": {},
+  "gitHead": "0df2d4a2b2d494826ebd4355d4246bc66781c5b2"
 }