@survicate/react-native-survicate 1.1.3 → 1.1.6

package/android/build/outputs/logs/manifest-merger-debug-report.txt

@@ -0,0 +1,25 @@
+-- Merging decision tree log ---
+manifest
+ADDED from /Users/kamilkowalski/Projects/survicate/code/react-native-survicate/android/src/main/AndroidManifest.xml:1:1-4:12
+INJECTED from /Users/kamilkowalski/Projects/survicate/code/react-native-survicate/android/src/main/AndroidManifest.xml:1:1-4:12
+INJECTED from /Users/kamilkowalski/Projects/survicate/code/react-native-survicate/android/src/main/AndroidManifest.xml:1:1-4:12
+	package
+		ADDED from /Users/kamilkowalski/Projects/survicate/code/react-native-survicate/android/src/main/AndroidManifest.xml:2:11-40
+		INJECTED from /Users/kamilkowalski/Projects/survicate/code/react-native-survicate/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/kamilkowalski/Projects/survicate/code/react-native-survicate/android/src/main/AndroidManifest.xml
+	xmlns:android
+		ADDED from /Users/kamilkowalski/Projects/survicate/code/react-native-survicate/android/src/main/AndroidManifest.xml:1:11-69
+uses-sdk
+INJECTED from /Users/kamilkowalski/Projects/survicate/code/react-native-survicate/android/src/main/AndroidManifest.xml reason: use-sdk injection requested
+INJECTED from /Users/kamilkowalski/Projects/survicate/code/react-native-survicate/android/src/main/AndroidManifest.xml
+INJECTED from /Users/kamilkowalski/Projects/survicate/code/react-native-survicate/android/src/main/AndroidManifest.xml
+INJECTED from /Users/kamilkowalski/Projects/survicate/code/react-native-survicate/android/src/main/AndroidManifest.xml
+INJECTED from /Users/kamilkowalski/Projects/survicate/code/react-native-survicate/android/src/main/AndroidManifest.xml
+	android:targetSdkVersion
+		INJECTED from /Users/kamilkowalski/Projects/survicate/code/react-native-survicate/android/src/main/AndroidManifest.xml
+		ADDED from /Users/kamilkowalski/Projects/survicate/code/react-native-survicate/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/kamilkowalski/Projects/survicate/code/react-native-survicate/android/src/main/AndroidManifest.xml
+	android:minSdkVersion
+		INJECTED from /Users/kamilkowalski/Projects/survicate/code/react-native-survicate/android/src/main/AndroidManifest.xml
+		ADDED from /Users/kamilkowalski/Projects/survicate/code/react-native-survicate/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/kamilkowalski/Projects/survicate/code/react-native-survicate/android/src/main/AndroidManifest.xml

package/android/build.gradle

@@ -10,18 +10,15 @@
 //   original location:
 //   - https://github.com/facebook/react-native/blob/0.58-stable/local-cli/templates/HelloWorld/android/app/build.gradle
 
-def DEFAULT_COMPILE_SDK_VERSION = 28
-def DEFAULT_BUILD_TOOLS_VERSION = '28.0.3'
+def DEFAULT_COMPILE_SDK_VERSION = 31
+def DEFAULT_BUILD_TOOLS_VERSION = '31.0.0'
 def DEFAULT_MIN_SDK_VERSION = 16
-def DEFAULT_TARGET_SDK_VERSION = 28
+def DEFAULT_TARGET_SDK_VERSION = 31
 
 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
@@ -33,13 +30,13 @@ buildscript {
             jcenter()
         }
         dependencies {
-            classpath 'com.android.tools.build:gradle:3.4.1'
+            classpath 'com.android.tools.build:gradle:4.2.2'
         }
     }
 }
 
 apply plugin: 'com.android.library'
-apply plugin: 'maven'
+apply plugin: "maven-publish"
 
 android {
     compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
@@ -77,35 +74,7 @@ repositories {
 dependencies {
     //noinspection GradleDynamicVersion
     implementation 'com.facebook.react:react-native:+'  // From node_modules
-    implementation 'com.survicate:survicate-sdk:1.5.5'
-}
-
-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.survicate.react"
-        description packageJson.description
-        url packageJson.repository.baseUrl
-
-        licenses {
-            license {
-                name packageJson.license
-                url packageJson.repository.baseUrl + '/blob/master/' + packageJson.licenseFilename
-                distribution 'repo'
-            }
-        }
-
-        developers {
-            developer {
-                id packageJson.author.username
-                name packageJson.author.name
-            }
-        }
-    }
+    implementation 'com.survicate:survicate-sdk:1.5.12'
 }
 
 afterEvaluate { project ->
@@ -119,22 +88,27 @@ afterEvaluate { project ->
     }
 
     task androidJavadocJar(type: Jar, dependsOn: androidJavadoc) {
-        classifier = 'javadoc'
+        archiveClassifier = 'javadoc'
         from androidJavadoc.destinationDir
     }
 
     task androidSourcesJar(type: Jar) {
-        classifier = 'sources'
+        archiveClassifier = 'sources'
         from android.sourceSets.main.java.srcDirs
         include '**/*.java'
     }
 
     android.libraryVariants.all { variant ->
-        def name = variant.name.capitalize()
-        def javaCompileTask = variant.javaCompileProvider.get()
+        def compileTask
+        if (variant.hasProperty('javaCompileProvider')){
+            compileTask = variant.javaCompileProvider.get()
+        }else{
+            compileTask = variant.javaCompile
+        }
 
-        task "jar${name}"(type: Jar, dependsOn: javaCompileTask) {
-            from javaCompileTask.destinationDir
+        def name = variant.name.capitalize()
+        task "jar${name}"(type: Jar, dependsOn: compileTask) {
+            from compileTask.destinationDir
         }
     }
 
@@ -143,12 +117,11 @@ afterEvaluate { project ->
         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
+    publishing {
+        publications {
+            maven(MavenPublication) {
+                artifact androidSourcesJar
+            }        
         }
     }
 }

package/android/gradle.properties

@@ -0,0 +1,21 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+
+android.useAndroidX=true
+android.enableJetifier=true

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@survicate/react-native-survicate",
   "title": "React Native Survicate Bindings",
-  "version": "1.1.3",
+  "version": "1.1.6",
   "description": "React Native bindings for Survicate Mobile SDK",
   "main": "index.js",
   "scripts": {

package/react-native-survicate.podspec

@@ -20,7 +20,7 @@ Pod::Spec.new do |s|
   s.requires_arc = true
 
   s.dependency "React"
-  s.dependency "Survicate", "1.6.1"
+  s.dependency "Survicate", "1.6.7"
   # ...
   # s.dependency "..."
 end