Merge pull request #62 from wix/R61

Upgrade to RN61

.gitignore

@@ -155,3 +155,5 @@ build/
 .idea
 .gradle
 local.properties
+android/.project
+android/.settings/*

ReactNativeAutogrowTextinput.podspec

@@ -0,0 +1,22 @@
+require 'json'
+
+package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
+
+Pod::Spec.new do |s|
+ s.name = "ReactNativeAutogrowTextinput"
+ s.version = package['version']
+ s.summary = package['description']
+
+ s.authors = package['author']
+ s.homepage = package['homepage']
+ s.license = package['license']
+ s.platforms = { :ios => "9.0", :tvos => "9.2" }
+
+ s.module_name = 'ReactNativeAutogrowTextinput'
+
+ s.source = { :git => "https://github.com/wix/react-native-autogrow-textinput", :tag => "#{s.version}" }
+ s.source_files = "./ios/**/*.{h,m}"
+
+ s.dependency 'React'
+ s.frameworks = 'UIKit'
+end

android/build.gradle

@@ -1,11 +1,11 @@
 apply plugin: 'com.android.library'
 
 android {
- compileSdkVersion 25
- buildToolsVersion "25.0.3"
+ compileSdkVersion 28
+ buildToolsVersion "28.0.3"
  defaultConfig {
  minSdkVersion 16
- targetSdkVersion 25
+ targetSdkVersion 28
  versionCode 1
  versionName "1.0"
  }
@@ -18,10 +18,9 @@ android {
 }
 
 dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
 
- compile 'com.android.support:appcompat-v7:25.3.1'
- compile 'com.facebook.react:react-native:+'
+ implementation 'com.facebook.react:react-native:+'
 
- testCompile 'junit:junit:4.12'
+ testImplementation 'junit:junit:4.12'
 }

example/.gitignore

@@ -20,7 +20,6 @@ DerivedData
 *.hmap
 *.ipa
 *.xcuserstate
-project.xcworkspace
 
 # Android/IntelliJ
 #
@@ -29,6 +28,8 @@ build/
 .gradle
 local.properties
 *.iml
+android/.project
+android/.settings/*
 
 # node.js
 #
@@ -40,17 +41,21 @@ yarn-error.log
 buck-out/
 \.buckd/
 *.keystore
+!debug.keystore
 
 # fastlane
 #
 # It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
 # screenshots whenever they are needed.
 # For more information about the recommended setup visit:
-# https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Gitignore.md
+# https://docs.fastlane.tools/best-practices/source-control/
 
 */fastlane/report.xml
 */fastlane/Preview.html
 */fastlane/screenshots
 
 # Bundle artifact
 *.jsbundle
+
+# CocoaPods
+/ios/Pods/

example/android/app/BUCK

@@ -8,23 +8,13 @@
 # - `buck install -r android/app` - compile, install and run application
 #
 
+load(":build_defs.bzl", "create_aar_targets", "create_jar_targets")
+
 lib_deps = []
 
-for jarfile in glob(['libs/*.jar']):
- name = 'jars__' + jarfile[jarfile.rindex('/') + 1: jarfile.rindex('.jar')]
- lib_deps.append(':' + name)
- prebuilt_jar(
- name = name,
- binary_jar = jarfile,
- )
+create_aar_targets(glob(["libs/*.aar"]))
 
-for aarfile in glob(['libs/*.aar']):
- name = 'aars__' + aarfile[aarfile.rindex('/') + 1: aarfile.rindex('.aar')]
- lib_deps.append(':' + name)
- android_prebuilt_aar(
- name = name,
- aar = aarfile,
- )
+create_jar_targets(glob(["libs/*.jar"]))
 
 android_library(
  name = "all-libs",
@@ -45,12 +35,12 @@ android_library(
 
 android_build_config(
  name = "build_config",
- package = "com.example",
+ package = "com.autogrowtextinput",
 )
 
 android_resource(
  name = "res",
- package = "com.example",
+ package = "com.autogrowtextinput",
  res = "src/main/res",
 )
 

example/android/app/build.gradle

@@ -18,6 +18,9 @@ import com.android.build.OutputFile
  * // the entry file for bundle generation
  * entryFile: "index.android.js",
  *
+ * // https://facebook.github.io/react-native/docs/performance#enable-the-ram-format
+ * bundleCommand: "ram-bundle",
+ *
  * // whether to bundle JS and assets in debug mode
  * bundleInDebug: false,
  *
@@ -33,6 +36,13 @@ import com.android.build.OutputFile
  * // bundleInPaidRelease: true,
  * // bundleInBeta: true,
  *
+ * // whether to disable dev mode in custom build variants (by default only disabled in release)
+ * // for example: to disable dev mode in the staging build type (if configured)
+ * devDisabledInStaging: true,
+ * // The configuration property can be in the following formats
+ * // 'devDisabledIn${productFlavor}${buildType}'
+ * // 'devDisabledIn${buildType}'
+ *
  * // the root of your project, i.e. where "package.json" lives
  * root: "../../",
  *
@@ -58,13 +68,18 @@ import com.android.build.OutputFile
  * inputExcludes: ["android/**", "ios/**"],
  *
  * // override which node gets called and with what additional arguments
- * nodeExecutableAndArgs: ["node"]
+ * nodeExecutableAndArgs: ["node"],
  *
  * // supply additional arguments to the packager
  * extraPackagerArgs: []
  * ]
  */
 
+project.ext.react = [
+ entryFile: "index.js",
+ enableHermes: false, // clean and rebuild if changing
+]
+
 apply from: "../../node_modules/react-native/react.gradle"
 
 /**
@@ -82,30 +97,67 @@ def enableSeparateBuildPerCPUArchitecture = false
  */
 def enableProguardInReleaseBuilds = false
 
+/**
+ * The preferred build flavor of JavaScriptCore.
+ *
+ * For example, to use the international variant, you can use:
+ * `def jscFlavor = 'org.webkit:android-jsc-intl:+'`
+ *
+ * The international variant includes ICU i18n library and necessary data
+ * allowing to use e.g. `Date.toLocaleString` and `String.localeCompare` that
+ * give correct results when using with locales other than en-US. Note that
+ * this variant is about 6MiB larger per architecture than default.
+ */
+def jscFlavor = 'org.webkit:android-jsc:+'
+
+/**
+ * Whether to enable the Hermes VM.
+ *
+ * This should be set on project.ext.react and mirrored here. If it is not set
+ * on project.ext.react, JavaScript will not be compiled to Hermes Bytecode
+ * and the benefits of using Hermes will therefore be sharply reduced.
+ */
+def enableHermes = project.ext.react.get("enableHermes", false);
+
 android {
  compileSdkVersion rootProject.ext.compileSdkVersion
- buildToolsVersion rootProject.ext.buildToolsVersion
+
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_1_8
+ targetCompatibility JavaVersion.VERSION_1_8
+ }
 
  defaultConfig {
- applicationId "com.example"
+ applicationId "com.autogrowtextinput"
  minSdkVersion rootProject.ext.minSdkVersion
  targetSdkVersion rootProject.ext.targetSdkVersion
  versionCode 1
  versionName "1.0"
- ndk {
- abiFilters "armeabi-v7a", "x86"
- }
  }
  splits {
  abi {
  reset()
  enable enableSeparateBuildPerCPUArchitecture
  universalApk false // If true, also generate a universal APK
- include "armeabi-v7a", "x86"
+ include "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
+ }
+ }
+ signingConfigs {
+ debug {
+ storeFile file('debug.keystore')
+ storePassword 'android'
+ keyAlias 'androiddebugkey'
+ keyPassword 'android'
  }
  }
  buildTypes {
+ debug {
+ signingConfig signingConfigs.debug
+ }
  release {
+ // Caution! In production, you need to generate your own keystore file.
+ // see https://facebook.github.io/react-native/docs/signed-apk-android.
+ signingConfig signingConfigs.debug
  minifyEnabled enableProguardInReleaseBuilds
  proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
  }
@@ -114,22 +166,29 @@ android {
  applicationVariants.all { variant ->
  variant.outputs.each { output ->
  // For each separate APK per architecture, set a unique version code as described here:
- // http://tools.android.com/tech-docs/new-build-system/user-guide/apk-splits
- def versionCodes = ["armeabi-v7a":1, "x86":2]
+ // https://developer.android.com/studio/build/configure-apk-splits.html
+ def versionCodes = ["armeabi-v7a": 1, "x86": 2, "arm64-v8a": 3, "x86_64": 4]
  def abi = output.getFilter(OutputFile.ABI)
  if (abi != null) { // null for the universal-debug, universal-release variants
  output.versionCodeOverride =
  versionCodes.get(abi) * 1048576 + defaultConfig.versionCode
  }
+
  }
  }
 }
 
 dependencies {
  implementation fileTree(dir: "libs", include: ["*.jar"])
- implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
  implementation "com.facebook.react:react-native:+" // From node_modules
- implementation project(':react-native-autogrow-textinput')
+
+ if (enableHermes) {
+ def hermesPath = "../../node_modules/hermes-engine/android/";
+ debugImplementation files(hermesPath + "hermes-debug.aar")
+ releaseImplementation files(hermesPath + "hermes-release.aar")
+ } else {
+ implementation jscFlavor
+ }
 }
 
 // Run this once to be able to run the application with BUCK
@@ -138,3 +197,5 @@ task copyDownloadableDepsToLibs(type: Copy) {
  from configurations.compile
  into 'libs'
 }
+
+apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)

example/android/app/build_defs.bzl

@@ -0,0 +1,19 @@
+"""Helper definitions to glob .aar and .jar targets"""
+
+def create_aar_targets(aarfiles):
+ for aarfile in aarfiles:
+ name = "aars__" + aarfile[aarfile.rindex("/") + 1:aarfile.rindex(".aar")]
+ lib_deps.append(":" + name)
+ android_prebuilt_aar(
+ name = name,
+ aar = aarfile,
+ )
+
+def create_jar_targets(jarfiles):
+ for jarfile in jarfiles:
+ name = "jars__" + jarfile[jarfile.rindex("/") + 1:jarfile.rindex(".jar")]
+ lib_deps.append(":" + name)
+ prebuilt_jar(
+ name = name,
+ binary_jar = jarfile,
+ )

example/android/app/proguard-rules.pro

@@ -8,10 +8,3 @@
 # http://developer.android.com/guide/developing/tools/proguard.html
 
 # Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-# public *;
-#}