Merge pull request #25 from bugfender/feature/update_module

Feature/update module

Author: joselufo

.gitignore

@@ -0,0 +1,42 @@
+# OSX
+#
+.DS_Store
+
+# node.js
+#
+node_modules/
+npm-debug.log
+yarn-error.log
+
+# Xcode
+#
+build/
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+*.xccheckout
+*.moved-aside
+DerivedData
+*.hmap
+*.ipa
+*.xcuserstate
+project.xcworkspace
+
+# Android/IntelliJ
+#
+build/
+.idea
+.gradle
+local.properties
+*.iml
+
+# BUCK
+buck-out/
+\.buckd/
+*.keystore

README.md

@@ -28,13 +28,7 @@ Add the bugfender plugin from npm
 `$ npm install @bugfender/rn-bugfender --save`
 
 ### Android
-If you are using react-native 0.60 or above, you are done! 
-
-**If using an older version of react-native** you still need to link the module to your project:
-```
-// Add the classes of the plugin to your android and iOS projects 
-$ npx react-native link @bugfender/rn-bugfender`
-```
+You are done!
 
 ### iOS 
 You can finish the installation manually or via CocoaPods (recommended)
@@ -46,33 +40,16 @@ You can finish the installation manually or via CocoaPods (recommended)
 $ cd path_to_your_project/ios
 $ pod init
 ```
-
-2. Link your project (**only on react-native versions prior 0.60**): 
-```
-// Add the classes of the plugin to your android and iOS projects 
-$ npx react-native link @bugfender/rn-bugfender`
-```
-
 Make sure you're targeting at least iOS platform version 10 (specify `platform :ios, '10.0'`).
 
-A new line should have been added automatically to your Podfile: 
-
-`pod 'RNBugfender', :path => '../node_modules/@bugfender/rn-bugfender'`
-
-3. After configuring the podfile you can now go to the console and run 
+2. After configuring the podfile you can now go to the console and run 
 
 `$ pod install`
 
 When the installation has finished you should be able to run your project in iOS and Android. 
 
 **Remember that you should be using the Xcode workspace instead of the xcodeproj file from now on.**
 
-**Important**: the *podspec* of RNBugfender declares React as a dependency. Your Podfile must explicitly override that React dependency. Like this: 
-
-`pod 'React', path: '../node_modules/react-native'`
-
-If you created your project with the react-native cli from React Native 0.60 or newer your podfile should be already prepared. For older versions of react-native you must ensure to override it. Otherwise, CocoaPods will download and install a new version in your iOS folder and you will end up with all the React libraries duplicated.  
-
 *At the end of this document you can find a **[recommended podfile](#recommended-podfile)**. You can use it as an example*. 
 
 If you have any problems compiling or executing, try our [Troubleshooting section](#cocoapods-troubleshooting) at the end of this document.

RNBugfender.podspec

@@ -1,6 +1,8 @@
-require 'json'
+# @bugfender/rn-bugfender.podspec
 
-package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
+require "json"
+
+package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 
 Pod::Spec.new do |s|
   s.name         = "RNBugfender"
@@ -11,14 +13,15 @@ Pod::Spec.new do |s|
   s.author       = package['author']
   s.homepage     = package['homepage']
 
-  s.platform     = :ios, "10.0"
+  s.platforms    = { :ios => "10.0" }
   s.requires_arc = true
   s.static_framework = true
 
   s.source       = { :git => "https://github.com/bugfender/BugfenderSDK-iOS", :tag => "master" }
   s.source_files  = 'ios/*.{h,m}'
 
-  s.dependency 'React'
+  s.dependency "React"
   s.dependency 'BugfenderSDK', '~> 1.10.3'
 
 end
+

android/build.gradle

@@ -1,103 +1,150 @@
-buildscript {
-  repositories {
-    jcenter()
-    maven { url 'https://maven.google.com' }
-  }
-
-  dependencies {
-    classpath 'com.android.tools.build:gradle:3.2.1'
-  }
+// android/build.gradle
+
+// based on:
+//
+// * https://github.com/facebook/react-native/blob/0.60-stable/template/android/build.gradle
+//   previous location:
+//   - https://github.com/facebook/react-native/blob/0.58-stable/local-cli/templates/HelloWorld/android/build.gradle
+//
+// * https://github.com/facebook/react-native/blob/0.60-stable/template/android/app/build.gradle
+//   previous location:
+//   - https://github.com/facebook/react-native/blob/0.58-stable/local-cli/templates/HelloWorld/android/app/build.gradle
+
+// These defaults should reflect the SDK versions used by
+// the minimum React Native version supported.
+def DEFAULT_COMPILE_SDK_VERSION = 28
+def DEFAULT_BUILD_TOOLS_VERSION = '28.0.3'
+def DEFAULT_MIN_SDK_VERSION = 16
+def DEFAULT_TARGET_SDK_VERSION = 28
+
+def safeExtGet(prop, fallback) {
+    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
 }
 
 apply plugin: 'com.android.library'
+apply plugin: 'maven'
+
+buildscript {
+    // The Android Gradle plugin is only required when opening the android folder stand-alone.
+    // This avoids unnecessary downloads and potential conflicts when the library is included as a
+    // module dependency in an application project.
+    // ref: https://docs.gradle.org/current/userguide/tutorial_using_tasks.html#sec:build_script_external_dependencies
+    if (project == rootProject) {
+        repositories {
+            google()
+        }
+        dependencies {
+            // This should reflect the Gradle plugin version used by
+            // the minimum React Native version supported.
+            classpath 'com.android.tools.build:gradle:3.4.1'
+        }
+    }
+}
 
 android {
-  compileSdkVersion 28
-  buildToolsVersion '28.0.3'
-
-  defaultConfig {
-    minSdkVersion 16
-    targetSdkVersion 28
-    versionCode 1
-    versionName "1.0"
-  }
-
-  lintOptions {
-    abortOnError false
-  }
+    compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
+    buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION)
+    defaultConfig {
+        minSdkVersion safeExtGet('minSdkVersion', DEFAULT_MIN_SDK_VERSION)
+        targetSdkVersion safeExtGet('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION)
+        versionCode 1
+        versionName "1.0"
+    }
+    lintOptions {
+        abortOnError false
+    }
 }
 
 repositories {
-  jcenter()
-  google()
-
-  def found = false
-  def defaultDir = null
-  def androidSourcesName = 'React Native sources'
-
-  if (rootProject.ext.has('reactNativeAndroidRoot')) {
-    defaultDir = rootProject.ext.get('reactNativeAndroidRoot')
-  } else {
-    defaultDir = new File(
-        projectDir,
-        '/../../../node_modules/react-native/android'
-    )
-  }
-
-  if (defaultDir.exists()) {
+    // ref: https://www.baeldung.com/maven-local-repository
+    mavenLocal()
+    maven {
+        // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
+        url "$rootDir/../node_modules/react-native/android"
+    }
     maven {
-      url defaultDir.toString()
-      name androidSourcesName
+        // Android JSC is installed from npm
+        url "$rootDir/../node_modules/jsc-android/dist"
     }
+    google()
+}
 
-    logger.info(":${project.name}:reactNativeAndroidRoot ${defaultDir.canonicalPath}")
-    found = true
-  } else {
-    def parentDir = rootProject.projectDir
-
-    1.upto(5, {
-      if (found) return true
-      parentDir = parentDir.parentFile
-
-      def androidSourcesDir = new File(
-          parentDir,
-          'node_modules/react-native'
-      )
-
-      def androidPrebuiltBinaryDir = new File(
-          parentDir,
-          'node_modules/react-native/android'
-      )
-
-      if (androidPrebuiltBinaryDir.exists()) {
-        maven {
-          url androidPrebuiltBinaryDir.toString()
-          name androidSourcesName
-        }
+dependencies {
+    //noinspection GradleDynamicVersion
+    implementation 'com.facebook.react:react-native:+'
+    //noinspection GradleDynamicVersion
+    implementation 'com.bugfender.sdk:android:3.+'
+}
 
-        logger.info(":${project.name}:reactNativeAndroidRoot ${androidPrebuiltBinaryDir.canonicalPath}")
-        found = true
-      } else if (androidSourcesDir.exists()) {
-        maven {
-          url androidSourcesDir.toString()
-          name androidSourcesName
+def configureReactNativePom(def pom) {
+    def packageJson = new groovy.json.JsonSlurper().parseText(file('../package.json').text)
+
+    pom.project {
+        name packageJson.title
+        artifactId packageJson.name
+        version = packageJson.version
+        group = "com.reactlibrary"
+        description packageJson.description
+        url packageJson.repository.baseUrl
+
+        licenses {
+            license {
+                name packageJson.license
+                url packageJson.repository.baseUrl + '/blob/master/' + packageJson.licenseFilename
+                distribution 'repo'
+            }
         }
 
-        logger.info(":${project.name}:reactNativeAndroidRoot ${androidSourcesDir.canonicalPath}")
-        found = true
-      }
-    })
-  }
-
-  if (!found) {
-    throw new GradleException(
-        "${project.name}: unable to locate React Native android sources. " +
-            "Ensure you have you installed React Native as a dependency in your project and try again."
-    )
-  }
+        developers {
+            developer {
+                id packageJson.author.username
+                name packageJson.author.name
+            }
+        }
+    }
 }
 
-dependencies {
-  implementation 'com.facebook.react:react-native:+'
-  implementation 'com.bugfender.sdk:android:3.+'
+afterEvaluate { project ->
+    // some Gradle build hooks ref:
+    // https://www.oreilly.com/library/view/gradle-beyond-the/9781449373801/ch03.html
+    task androidJavadoc(type: Javadoc) {
+        source = android.sourceSets.main.java.srcDirs
+        classpath += files(android.bootClasspath)
+        classpath += files(project.getConfigurations().getByName('compile').asList())
+        include '**/*.java'
+    }
+
+    task androidJavadocJar(type: Jar, dependsOn: androidJavadoc) {
+        classifier = 'javadoc'
+        from androidJavadoc.destinationDir
+    }
+
+    task androidSourcesJar(type: Jar) {
+        classifier = 'sources'
+        from android.sourceSets.main.java.srcDirs
+        include '**/*.java'
+    }
+
+    android.libraryVariants.all { variant ->
+        def name = variant.name.capitalize()
+        def javaCompileTask = variant.javaCompileProvider.get()
+
+        task "jar${name}"(type: Jar, dependsOn: javaCompileTask) {
+            from javaCompileTask.destinationDir
+        }
+    }
+
+    artifacts {
+        archives androidSourcesJar
+        archives androidJavadocJar
+    }
+
+    task installArchives(type: Upload) {
+        configuration = configurations.archives
+        repositories.mavenDeployer {
+            // Deploy to react-native-event-bridge/maven, ready to publish to npm
+            repository url: "file://${projectDir}/../android/maven"
+            configureReactNativePom pom
+        }
+    }
 }