Fixes on build gradle, pod, readme

OvalMoney · Aug 15, 2019 · 7129ccd · 7129ccd
1 parent b0ddfaa
commit 7129ccd
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -23,9 +23,9 @@ or
 
 #### iOS
 
-### Pod
-
-You can run `pod install` inside your ios folder to install the package automatically.
+### Pods
+Add the line below to your podfile then run `pod install`
+`pod 'react-native-fitness', :path => '../node_modules/@ovalmoney/react-native-fitness'`
 
 ### Manually
 

diff --git a/android/build.gradle b/android/build.gradle
@@ -4,24 +4,27 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.1'
+        classpath 'com.android.tools.build:gradle:2.1.3'
     }
 }
 
+def safeExtGet(prop, fallback) {
+    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+}
+
 apply plugin: 'com.android.library'
 
-def DEFAULT_COMPILE_SDK_VERSION = 27
-def DEFAULT_BUILD_TOOLS_VERSION = "27.0.3"
-def DEFAULT_TARGET_SDK_VERSION = 27
-def GOOGLE_LIB_VERSION = "17.0.0"
+def DEFAULT_COMPILE_SDK_VERSION = 28
+def DEFAULT_BUILD_TOOLS_VERSION = "28.0.3"
+def DEFAULT_TARGET_SDK_VERSION = 28
 
 android {
-    compileSdkVersion project.hasProperty('compileSdkVersion') ? project.compileSdkVersion : DEFAULT_COMPILE_SDK_VERSION
-    buildToolsVersion project.hasProperty('buildToolsVersion') ? project.buildToolsVersion : DEFAULT_BUILD_TOOLS_VERSION
+    compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
+    buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION)
 
     defaultConfig {
-        minSdkVersion 16
-        targetSdkVersion project.hasProperty('targetSdkVersion') ? project.targetSdkVersion : DEFAULT_TARGET_SDK_VERSION
+        minSdkVersion safeExtGet('minSdkVersion', 16)
+        targetSdkVersion safeExtGet('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION)
         versionCode 1
         versionName "1.0"
     }
@@ -35,9 +38,7 @@ repositories {
 }
 
 dependencies {
-    def googleVersion = project.hasProperty('googleLibVersion') ? project.googleLibVersion : GOOGLE_LIB_VERSION
-
     compile 'com.facebook.react:react-native:+'
-    compile "com.google.android.gms:play-services-fitness:$googleVersion"
-    compile "com.google.android.gms:play-services-auth:$googleVersion"
+    compile "com.google.android.gms:play-services-fitness:${safeExtGet('googlePlayServicesVersion', '+')}"
+    compile "com.google.android.gms:play-services-auth:${safeExtGet('googlePlayServicesVersion', '+')}"
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,5 @@
 {
   "name": "@ovalmoney/react-native-fitness",
-  "podName": "react-native-fitness",
   "version": "0.2.0",
   "description": "A React Native package that gives you access to Apple kit and Google Fit data.",
   "main": "./js/index.js",

diff --git a/react-native-fitness.podspec b/react-native-fitness.podspec
@@ -3,7 +3,7 @@ require 'json'
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
 
 Pod::Spec.new do |s|
-  s.name         = package['podName']
+  s.name         = 'react-native-fitness'
   s.version      = package['version']
   s.summary      = package['description']