prepare for react 0.60

Author: aMarCruz

CHANGELOG.md

@@ -2,6 +2,20 @@
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## \[Unreleased]
+
+### Added
+
+- Updated README.md with example for flatHeights - Thanks to @donni106
+
+### Changed
+
+- The dependency on android.support.annotations is replaced by javax.annotation
+
+### Fixed
+
+- fix s.source_files regex to match RNTextSize source files: RNTextSize - Thanks to @abegehr
+
 ## \[3.0.0] - 2019-01-10
 
 ### Added

android/build.gradle

@@ -8,9 +8,9 @@ def safeExtGet(prop, fallback) {
     return rootProject.ext.hasProperty(prop) ? rootProject.ext.get(prop) : fallback
 }
 
-def _buildToolsVersion  = safeExtGet('buildToolsVersion', '27.0.3')
-def _compileSdkVersion  = safeExtGet('compileSdkVersion', 27)
-def _targetSdkVersion   = safeExtGet('targetSdkVersion', 26)
+def _buildToolsVersion  = safeExtGet('buildToolsVersion', '28.0.3')
+def _compileSdkVersion  = safeExtGet('compileSdkVersion', 28)
+def _targetSdkVersion   = safeExtGet('targetSdkVersion', 28)
 def _minSdkVersion      = safeExtGet('minSdkVersion', 16)
 
 buildscript {
@@ -19,7 +19,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.4.1'
     }
 }
 
@@ -32,7 +32,7 @@ android {
     defaultConfig {
         minSdkVersion _minSdkVersion
         targetSdkVersion _targetSdkVersion
-        versionCode 3
+        versionCode 4
         versionName getPackageVersion()
     }
     lintOptions {

android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

android/src/main/java/com/github/amarcruz/rntextsize/RNTextSizeConf.java

@@ -2,8 +2,6 @@
 
 import android.graphics.Typeface;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.text.Layout;
 import android.util.Log;
 
@@ -17,6 +15,9 @@
 
 import java.util.Map;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 @SuppressWarnings("SameParameterValue")
 final class RNTextSizeConf {
 
@@ -38,9 +39,9 @@ final class RNTextSizeConf {
     /**
      * Make a Typeface from the supplied font family and style.
      */
-    @NonNull
+    @Nonnull
     static Typeface getFont(
-            @NonNull final ReactApplicationContext context,
+            @Nonnull final ReactApplicationContext context,
             @Nullable String family,
             final int style
     ) {
@@ -76,7 +77,7 @@ static boolean supportUpperCaseTransform() {
      * @param options User options
      * @param forText This will be used for measure text?
      */
-    RNTextSizeConf(@NonNull final ReadableMap options, final boolean forText) {
+    RNTextSizeConf(@Nonnull final ReadableMap options, final boolean forText) {
         mOpts = options;
 
         allowFontScaling = forText && getBooleanOrTrue("allowFontScaling");
@@ -89,27 +90,27 @@ static boolean supportUpperCaseTransform() {
         letterSpacing = supportLetterSpacing() ? getFloatOrNaN("letterSpacing") : Float.NaN;
     }
 
-    boolean has(@NonNull final String name) {
+    boolean has(@Nonnull final String name) {
         return mOpts.hasKey(name);
     }
 
-    boolean getBooleanOrTrue(@NonNull final String name) {
+    boolean getBooleanOrTrue(@Nonnull final String name) {
         return !mOpts.hasKey(name) || mOpts.getBoolean(name);
     }
 
-    Integer getIntOrNull(@NonNull final String name) {
+    Integer getIntOrNull(@Nonnull final String name) {
         return mOpts.hasKey(name)
                 ? mOpts.getInt(name) : null;
     }
 
     @Nullable
-    String getString(@NonNull final String name) {
+    String getString(@Nonnull final String name) {
         return mOpts.hasKey(name)
                 ? mOpts.getString(name) : null;
     }
 
     @Nullable
-    ReadableArray getArray(@NonNull final String name) {
+    ReadableArray getArray(@Nonnull final String name) {
         return mOpts.hasKey(name) && mOpts.getType(name) == ReadableType.Array
                 ? mOpts.getArray(name) : null;
     }
@@ -152,7 +153,7 @@ int getTextBreakStrategy() {
         return Layout.BREAK_STRATEGY_HIGH_QUALITY;
     }
 
-    private float getFloatOrNaN(@NonNull final String name) {
+    private float getFloatOrNaN(@Nonnull final String name) {
         return mOpts.hasKey(name) ? (float) mOpts.getDouble(name) : Float.NaN;
     }
 

android/src/main/java/com/github/amarcruz/rntextsize/RNTextSizeModule.java

@@ -4,8 +4,6 @@
 import android.graphics.Paint;
 import android.graphics.Typeface;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.text.BoringLayout;
 import android.text.Layout;
 import android.text.SpannableString;
@@ -30,6 +28,9 @@
 import java.util.Collections;
 import java.util.List;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 class RNTextSizeModule extends ReactContextBaseJavaModule {
     private static final String TAG = "RNTextSize";
     private static final float SPACING_ADDITION = 0f;
@@ -401,11 +402,11 @@ private WritableMap makeFontSpecs(String suffix, int fontSize, double letterSpac
         return makeFontSpecs(suffix, fontSize, letterSpacing, false);
     }
 
-    @NonNull
+    @Nonnull
     private WritableMap fontInfoFromTypeface(
-            @NonNull final TextPaint textPaint,
-            @NonNull final Typeface typeface,
-            @NonNull final RNTextSizeConf conf
+            @Nonnull final TextPaint textPaint,
+            @Nonnull final Typeface typeface,
+            @Nonnull final RNTextSizeConf conf
     ) {
         // Info is always in unscaled values
         final float density = getCurrentDensity();
@@ -444,7 +445,7 @@ private float getCurrentDensity() {
      * Set the font names in assets/fonts into the target array.
      * @param destArr Target
      */
-    private void getFontsInAssets(@NonNull WritableArray destArr) {
+    private void getFontsInAssets(@Nonnull WritableArray destArr) {
         String[] srcArr = fontsInAssets;
 
         if (srcArr == null) {
@@ -475,8 +476,8 @@ private void getFontsInAssets(@NonNull WritableArray destArr) {
     }
 
     private void addFamilyToArray(
-            @NonNull final List<String> outArr,
-            @NonNull final String spec
+            @Nonnull final List<String> outArr,
+            @Nonnull final String spec
     ) {
         for (String ext : FILE_EXTENSIONS) {
             if (spec.endsWith(ext)) {

android/src/main/java/com/github/amarcruz/rntextsize/RNTextSizeSpannedText.java

@@ -3,22 +3,23 @@
 import android.annotation.TargetApi;
 import android.graphics.Typeface;
 import android.os.Build;
-import android.support.annotation.NonNull;
 import android.text.Spannable;
 import android.text.TextPaint;
 import android.text.style.AbsoluteSizeSpan;
 import android.text.style.MetricAffectingSpan;
 
 import com.facebook.react.bridge.ReactApplicationContext;
 
+import javax.annotation.Nonnull;
+
 final class RNTextSizeSpannedText {
 
     RNTextSizeSpannedText() {}
 
     static Spannable spannedFromSpecsAndText(
-            @NonNull final ReactApplicationContext context,
-            @NonNull final RNTextSizeConf conf,
-            @NonNull final Spannable text
+            @Nonnull final ReactApplicationContext context,
+            @Nonnull final RNTextSizeConf conf,
+            @Nonnull final Spannable text
     ) {
 
         //final SpannableString str = new SpannableString(text);
@@ -87,7 +88,7 @@ public void updateDrawState(TextPaint paint) {
         }
 
         @Override
-        public void updateMeasureState(TextPaint paint) {
+        public void updateMeasureState(@Nonnull TextPaint paint) {
             apply(paint);
         }
 
@@ -114,7 +115,7 @@ public void updateDrawState(TextPaint ds) {
         }
 
         @Override
-        public void updateMeasureState(TextPaint paint) {
+        public void updateMeasureState(@Nonnull TextPaint paint) {
             apply(paint, mTypeface);
         }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-text-size",
-  "version": "3.0.0",
+  "version": "4.0.0-rc.1",
   "description": "Measure text accurately before laying it out and get font information from your App",
   "main": "index.js",
   "keywords": [
@@ -25,6 +25,6 @@
     "clean": "rm -rf $TMPDIR/react-* && watchman watch-del-all && cd android && ./gradlew clean"
   },
   "peerDependencies": {
-    "react-native": ">=0.57.0"
+    "react-native": ">=0.59.0"
   }
 }