react-native-acoustic-connect-beta 16.0.27 → 16.0.29

package/Example/nativebase-v3-kitchensink/package.json

@@ -15,7 +15,7 @@
         "react": "18.2.0",
         "react-dom": "18.2.0",
         "react-native": "0.72.10",
-        "react-native-acoustic-connect-beta": "16.0.27",
+        "react-native-acoustic-connect-beta": "16.0.29",
         "react-native-gesture-handler": "~2.12.0",
         "react-native-keyboard-aware-scroll-view": "^0.9.5",
         "react-native-reanimated": "~3.3.0",

package/Jenkinsfile

@@ -101,6 +101,7 @@ pipeline {
                 script{
                     echo "genBuild:${genBuild}"
                     if (genBuild) {
+                        updateLibraryDependencies(true)
                         publishBeta()
                     }
                 }
@@ -443,6 +444,66 @@ def updateLibVersion() {
     echo "${updatedExamplePackageFile}"
 }
 
+def updateLibraryDependencies(isBeta) {
+    def androidConnectLatest = getAndroidLatestVersion(isBeta, "connect")
+    def androidTealeafLatest = getAndroidLatestVersion(isBeta, "tealeaf")
+    def androidEOCoreLatest  = getAndroidLatestVersion(isBeta, "eocore")
+
+    downloadAndroidLatestVersion(isBeta, "connect", androidConnectLatest)
+    downloadAndroidLatestVersion(isBeta, "tealeaf", androidTealeafLatest)
+    downloadAndroidLatestVersion(isBeta, "eocore",  androidEOCoreLatest)
+
+    runCMD("cd ${buildDir} && unzip tempconnect.zip -d tempconnect")
+    runCMD("cd ${buildDir} && unzip temptealeaf.zip -d temptealeaf")
+    runCMD("cd ${buildDir} && unzip tempeocore.zip -d tempeocore")
+
+    // update asset files
+    runCMD("cd ${buildDir} && cp -fr tempconnect/assets/ConnectAdvancedConfig.json    android/src/main/assets/ConnectAdvancedConfig.json")
+    runCMD("cd ${buildDir} && cp -fr temptealeaf/assets/TealeafBasicConfig.properties android/src/main/assets/TealeafBasicConfig.properties")
+    runCMD("cd ${buildDir} && cp -fr temptealeaf/assets/TealeafLayoutConfig.json      android/src/main/assets/TealeafLayoutConfig.json")
+    runCMD("cd ${buildDir} && cp -fr temptealeaf/assets/TealeafAdvancedConfig.json    android/src/main/assets/TealeafAdvancedConfig.json")
+    runCMD("cd ${buildDir} && cp -fr tempeocore/assets/EOCoreBasicConfig.properties   android/src/main/assets/EOCoreBasicConfig.properties")
+    runCMD("cd ${buildDir} && cp -fr tempeocore/assets/EOCoreAdvancedConfig.json      android/src/main/assets/EOCoreAdvancedConfig.json")
+
+    // delete temp files
+    runCMD("cd ${buildDir} && rm tempconnect.zip")
+    runCMD("cd ${buildDir} && rm temptealeaf.zip")
+    runCMD("cd ${buildDir} && rm tempeocore.zip")
+    runCMD("cd ${buildDir} && rm -rf tempconnect")
+    runCMD("cd ${buildDir} && rm -rf temptealeaf")
+    runCMD("cd ${buildDir} && rm -rf tempeocore")
+
+    // update library version
+    def configPath = "${buildDir}/scripts/ConnectConfig.json"
+    def configContent = readFile "${configPath}"
+    Map jsonContent = (Map) new JsonSlurper().parseText(configContent)
+    jsonContent.Connect.put("AndroidVersion", androidConnectLatest)
+    //convert maps/arrays to json formatted string
+    def json = JsonOutput.toJson(jsonContent)
+    json = JsonOutput.prettyPrint(json)
+    writeFile(file:"${configPath}", text: json)
+}
+
+def getAndroidLatestVersion(isBeta, libName) {
+    def mavenLocation = "staging"
+    if (!isBeta) {
+        mavenLocation = "releases"
+    }
+    def mavenUrl = "https://s01.oss.sonatype.org/content/repositories/${mavenLocation}/io/github/go-acoustic/${libName}/maven-metadata.xml"
+    return runCMD("curl ${mavenUrl} | grep '<latest>.*</latest>' | cut -d '>' -f2 | cut -d '<' -f1")
+}
+
+def downloadAndroidLatestVersion(isBeta, libName, libVersion) {
+    def mavenLocation = "staging"
+    if (!isBeta) {
+        mavenLocation = "releases"
+    }
+
+    def mavenUrl = "https://s01.oss.sonatype.org/content/repositories/${mavenLocation}/io/github/go-acoustic/${libName}/${libVersion}/${libName}-${libVersion}.aar"
+    // Download files
+    runCMD("cd ${buildDir} && curl ${mavenUrl} --output temp${libName}.zip")
+}
+
 def runCMD(commnd) {
     echo "${commnd}"
     OUUUTTPT = sh (
@@ -547,7 +608,6 @@ def publishRelease() {
     runCMD("cd ${releaseDir} && git grep -l 'connect-beta' | xargs sed -i '' -e 's/connect-beta/connect/g'")
     runCMD("cd ${releaseDir} && git grep -l 'BETA: ' | xargs sed -i '' -e 's/BETA: //g'")
     runCMD("cd ${releaseDir} && git grep -l 'react-native-acoustic-connect-beta.podspec' | xargs sed -i '' -e 's/react-native-acoustic-connect-beta.podspec/react-native-acoustic-connect.podspec/g'")
-    runCMD("cd ${releaseDir} && git grep -l 'https://raw.githubusercontent.com/go-acoustic/Android_Maven/beta' | xargs sed -i '' -e 's/https:\\/\\/raw.githubusercontent.com\\/go-acoustic\\/Android_Maven\\/beta/https:\\/\\/raw.githubusercontent.com\\/go-acoustic\\/Android_Maven\\/master/g'")
     runCMD("mv ${releaseDir}/react-native-acoustic-connect-beta.podspec  ${releaseDir}/react-native-acoustic-connect.podspec")
 
     // Update package-lock.json

package/android/config.gradle

@@ -42,7 +42,38 @@ def updateTealeafBasicConfig(mp, json) {
             // Just update the following items
             if (config_key == "AppKey" ||
                 config_key == "PostMessageUrl" ||
-                config_key == "KillSwitchUrl") {
+                config_key == "KillSwitchUrl" ||
+                config_key == "KillSwitchEnabled" ||
+                config_key == "KillSwitchMaxNumberOfTries" ||
+                config_key == "KillSwitchTimeInterval" ||
+                config_key == "UseWhiteList" ||
+                config_key == "WhiteListParam" ||
+                config_key == "UseRandomSample" ||
+                config_key == "RandomSampleParam" ||
+                config_key == "PrintScreen" ||
+                config_key == "Connection" ||
+                config_key == "MaxStringsLength" ||
+                config_key == "CookieUrl" ||
+                config_key == "CookieParam" ||
+                config_key == "CookiePath" ||
+                config_key == "CookieDomain" ||
+                config_key == "CookieExpires" ||
+                config_key == "CookieSecure" ||
+                config_key == "CookieExpiresFormat" ||
+                config_key == "SessionTimeout" ||
+                config_key == "SessionTimeoutKillSwitch" ||
+                config_key == "disableTLTDID" ||
+                config_key == "ScreenshotFormat" ||
+                config_key == "PercentOfScreenshotsSize" ||
+                config_key == "PercentToCompressImage" ||
+                config_key == "ScreenShotPixelDensity" ||
+                config_key == "LogViewLayoutOnScreenTransition" ||
+                config_key == "GetImageDataOnScreenLayout" ||
+                config_key == "SetGestureDetector" ||
+                config_key == "CaptureNativeGesturesOnWebview" ||
+                config_key == "LogLocationEnabled" ||
+                config_key == "LogLocationTries" ||
+                config_key == "LogLocationTimeout" ) {
                 println(config_key + "=" + config_value)
                 properties.setProperty(config_key, config_value.toString())
             }
@@ -71,6 +102,155 @@ def updateLayoutConfig(mp, json){
     println("Updating:$layoutConfigPath")
 }
 
+def updateTealeafAdvConfig(mp, json) {
+    def tealeafAdvConfigPath = "$mp/src/main/assets/TealeafAdvancedConfig.json"
+    println("Reading file $tealeafAdvConfigPath")
+    def jsonSlurper = new JsonSlurper()
+    def tealeafAdvConfigData = jsonSlurper.parse(new File(tealeafAdvConfigPath))
+
+    json.each { key, value ->
+        if(key != "Connect"){ return }
+
+        value.each { config_key, config_value ->
+            if(config_value.getClass() != java.lang.String
+            && config_value.getClass() != java.lang.Boolean
+            && config_value.getClass() != java.lang.Integer){
+                return
+            }
+            // Just update the following items
+            if (config_key == "AddMessageTypeHeader" ||
+                config_key == "ClickEventEnabled" ||
+                config_key == "ColorAccent" ||
+                config_key == "ColorPrimary" ||
+                config_key == "ColorPrimaryDark" ||
+                config_key == "DefaultAutoLayoutDelay" ||
+                config_key == "DefaultTextViewGravity" ||
+                config_key == "DefaultTextViewPaddingLeft" ||
+                config_key == "DefaultTextViewPaddingRight" ||
+                config_key == "EditTextEnabled" ||
+                config_key == "EnableActivityLifeCycleListener" ||
+                config_key == "EnableFragmentLifeCycleListener" ||
+                config_key == "EnableGestureSwipeLogScreen" ||
+                config_key == "EnableScreenshotCache" ||
+                config_key == "ExcludeTextViewStyleForOS" ||
+                config_key == "ExtendsGoogleWebViewClient" ||
+                config_key == "FilterMessageTypes" ||
+                config_key == "FlushUpdatedPlaceHolders" ||
+                config_key == "GenerateImageHash" ||
+                config_key == "GestureConfirmedScreenshotDelay" ||
+                config_key == "GoogleWebViewEnabled" ||
+                config_key == "InitialZIndex" ||
+                config_key == "IpPlaceholder" ||
+                config_key == "KillSwitchAsync" ||
+                config_key == "KillSwitchDelay" ||
+                config_key == "LogFullRequestResponsePayloads" ||
+                config_key == "MessageTypeHeader" ||
+                config_key == "MessageTypes" ||
+                config_key == "NavigationControllerEnabled" ||
+                config_key == "RemoveAllCookies" ||
+                config_key == "RemoveIp" ||
+                config_key == "ScreenViewUnloadDelay" ||
+                config_key == "StripDrawableFolderExt" ||
+                config_key == "SwitchWidth" ||
+                config_key == "TouchEventEnabled" ||
+                config_key == "UseXpathId" ||
+                config_key == "UseZindex" ||
+                config_key == "WebViewDelay" ||
+                config_key == "WebViewSetTagForId" ) {
+                println(config_key + "=" + config_value)
+                tealeafAdvConfigData[config_key] = config_value
+            }
+        }
+    }
+
+    def tealeafAdvConfigFile = new File(tealeafAdvConfigPath)
+    tealeafAdvConfigFile.text = JsonOutput.toJson(tealeafAdvConfigData)
+    println("Updating:$tealeafAdvConfigPath")
+}
+
+def updateEOCoreBasicConfig(mp, json) {
+    def propertiesFile = "$mp/src/main/assets/EOCoreBasicConfig.properties"
+    FileInputStream _file = new FileInputStream(propertiesFile);
+    Properties properties = new Properties();
+    properties.load(_file);
+    _file.close();
+
+    FileOutputStream out = new FileOutputStream(propertiesFile);
+
+    json.each { key, value ->
+        if(key != "Connect"){ return }
+
+        println("Update/Add the following key/values:")
+        value.each { config_key, config_value ->
+            if(config_value.getClass() != java.lang.String
+            && config_value.getClass() != java.lang.Boolean
+            && config_value.getClass() != java.lang.Integer){
+                return
+            }
+            // Just update the following items
+            if (config_key == "LoggingLevel" ||
+                config_key == "DisplayLogging" ||
+                config_key == "PersistLocalCache" ||
+                config_key == "CachingLevel" ||
+                config_key == "PostMessageLevelWiFi" ||
+                config_key == "PostMessageLevelCellular" ||
+                config_key == "ManualPostEnabled" ||
+                config_key == "DoPostOnIntervals" ||
+                config_key == "PostMessageTimeInterval") {
+                println(config_key + "=" + config_value)
+                properties.setProperty(config_key, config_value.toString())
+            }
+        }
+    }
+
+    properties.store(out, null);
+    out.close();
+    println("Updating:$propertiesFile")
+}
+
+def updateEOCoreAdvConfig(mp, json) {
+    def eocoreAdvConfigPath = "$mp/src/main/assets/EOCoreAdvancedConfig.json"
+    println("Reading file $eocoreAdvConfigPath")
+    def jsonSlurper = new JsonSlurper()
+    def eocoreAdvConfigData = jsonSlurper.parse(new File(eocoreAdvConfigPath))
+
+    json.each { key, value ->
+        if(key != "Connect"){ return }
+
+        value.each { config_key, config_value ->
+            if(config_value.getClass() != java.lang.String
+            && config_value.getClass() != java.lang.Boolean
+            && config_value.getClass() != java.lang.Integer){
+                return
+            }
+            // Just update the following items
+            if (config_key == "ApplicationBackgroundTimeInterval" ||
+                config_key == "ApplicationInBackgroundEnabled" ||
+                config_key == "BufferPercent" ||
+                config_key == "CachedFileMaxBytesSize" ||
+                config_key == "CompressPostMessage" ||
+                config_key == "DefaultOrientation" ||
+                config_key == "DisableCookieManager" ||
+                config_key == "MNCMCC" ||
+                config_key == "MaxNumberOfFilesToCache" ||
+                config_key == "MessageVersion" ||
+                config_key == "OrientationDelayNotificationToModules" ||
+                config_key == "OrientationSensorDelay" ||
+                config_key == "PostMessageMaxBytesSize" ||
+                config_key == "PostMessageSocketTimeout" ||
+                config_key == "PostMessageTimeout" ||
+                config_key == "TurnOffCorrectOrientationUpdates" ) {
+                println(config_key + "=" + config_value)
+                eocoreAdvConfigData[config_key] = config_value
+            }
+        }
+    }
+
+    def eocoreAdvConfigFile = new File(eocoreAdvConfigPath)
+    eocoreAdvConfigFile.text = JsonOutput.toJson(eocoreAdvConfigData)
+    println("Updating:$eocoreAdvConfigPath")
+}
+
 def updateGradle(mp, json){
     def buildGradlePath = "$mp/build.gradle"
     def buildGradleFile = new File(buildGradlePath)
@@ -104,6 +284,12 @@ try {
     println("Step 3:")
     updateLayoutConfig(module_path, configJSONData)
     println("Step 4:")
+    updateTealeafAdvConfig(module_path, configJSONData)
+    println("Step 5:")
+    updateEOCoreBasicConfig(module_path, configJSONData)
+    println("Step 6:")
+    updateEOCoreAdvConfig(module_path, configJSONData)
+    println("Step 7:")
     updateGradle(module_path, configJSONData)
     println("*********************************************************************************************")
 } catch (FileNotFoundException e) {

package/android/src/main/assets/ConnectAdvancedConfig.json

@@ -0,0 +1,3 @@
+{
+    "LibraryVersion": "10.4.21"
+}