diff --git a/.gitignore b/.gitignore index f2e672c..28fe0bc 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,6 @@ /captures /ios/build /ios/*.zip - +/android/lib +/android/libs +/android/java-sources.txt \ No newline at end of file diff --git a/android/.gradle/6.0/fileChanges/last-build.bin b/android/.gradle/6.0/fileChanges/last-build.bin new file mode 100644 index 0000000..f76dd23 Binary files /dev/null and b/android/.gradle/6.0/fileChanges/last-build.bin differ diff --git a/android/.gradle/6.0/fileHashes/fileHashes.lock b/android/.gradle/6.0/fileHashes/fileHashes.lock new file mode 100644 index 0000000..c63f849 Binary files /dev/null and b/android/.gradle/6.0/fileHashes/fileHashes.lock differ diff --git a/android/.gradle/6.0/gc.properties b/android/.gradle/6.0/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock new file mode 100644 index 0000000..fe5b59a Binary files /dev/null and b/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/android/.gradle/buildOutputCleanup/cache.properties b/android/.gradle/buildOutputCleanup/cache.properties new file mode 100644 index 0000000..907195a --- /dev/null +++ b/android/.gradle/buildOutputCleanup/cache.properties @@ -0,0 +1,2 @@ +#Sat Feb 29 09:05:30 EST 2020 +gradle.version=6.0 diff --git a/android/.gradle/vcs-1/gc.properties b/android/.gradle/vcs-1/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/android/.project b/android/.project new file mode 100644 index 0000000..3964dd3 --- /dev/null +++ b/android/.project @@ -0,0 +1,17 @@ + + + android + Project android created by Buildship. + + + + + org.eclipse.buildship.core.gradleprojectbuilder + + + + + + org.eclipse.buildship.core.gradleprojectnature + + diff --git a/android/.settings/org.eclipse.buildship.core.prefs b/android/.settings/org.eclipse.buildship.core.prefs new file mode 100644 index 0000000..506e44c --- /dev/null +++ b/android/.settings/org.eclipse.buildship.core.prefs @@ -0,0 +1,13 @@ +arguments= +auto.sync=false +build.scans.enabled=false +connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(6.0)) +connection.project.dir= +eclipse.preferences.version=1 +gradle.user.home= +java.home=/Library/Java/JavaVirtualMachines/jdk-11.0.1.jdk/Contents/Home +jvm.arguments= +offline.mode=false +override.workspace.settings=true +show.console.view=true +show.executions.view=true diff --git a/android/manifest b/android/manifest index df9a665..16d0e48 100644 --- a/android/manifest +++ b/android/manifest @@ -4,7 +4,8 @@ # version: 2.0.0 apiversion: 4 -architectures: arm64-v8a armeabi-v7a x86 x86_64 +#architectures: arm64-v8a armeabi-v7a x86 x86_64 +architectures: arm64-v8a armeabi-v7a x86 description: Visual Studio App Center SDK for Axway Titanium author: Sergey Volkov license: Apache 2.0 @@ -15,4 +16,4 @@ name: ti.appcenter moduleid: ru.netris.mobile.appcenter guid: b9eab43a-1867-45ef-b6f6-46db26f0c6ef platform: android -minsdk: 9.0.0 +minsdk: 8.3.1.GA diff --git a/android/src/ru/netris/mobile/appcenter/crashes/TiAppCenterCrashesModule.java b/android/src/ru/netris/mobile/appcenter/crashes/TiAppCenterCrashesModule.java index 98b74b8..d466535 100644 --- a/android/src/ru/netris/mobile/appcenter/crashes/TiAppCenterCrashesModule.java +++ b/android/src/ru/netris/mobile/appcenter/crashes/TiAppCenterCrashesModule.java @@ -17,7 +17,9 @@ import java.util.ArrayList; import java.util.Collection; +import java.util.HashMap; import java.util.LinkedList; +import java.util.Map; import ru.netris.mobile.appcenter.TiAppcenterModule; import ru.netris.mobile.appcenter.utils.TiAppCenterUtils; @@ -67,6 +69,26 @@ public String getApiName() return "TiAppCenterCrashes"; } + @Kroll.method + public void trackError(String exception, KrollDict[] properties) + { + try { + Map propertiesHash = new HashMap(); + if (properties != null) { + for (KrollDict prop : properties) { + String key = TiConvert.toString(prop, "key"); + String value = TiConvert.toString(prop, "value"); + propertiesHash.put(key, value); + } + } + + Crashes.trackError(new Exception(exception), propertiesHash, null); + } catch (Exception e) { + TiAppCenterUtils.logError("Failed to track error: " + exception); + TiAppCenterUtils.logError(android.util.Log.getStackTraceString(e)); + } + } + @Kroll.method public void lastSessionCrashReport(final KrollFunction callback) { diff --git a/ios/dist/ru.netris.mobile.appcenter-iphone-1.0.1.zip b/ios/dist/ru.netris.mobile.appcenter-iphone-1.0.1.zip new file mode 100644 index 0000000..62744eb Binary files /dev/null and b/ios/dist/ru.netris.mobile.appcenter-iphone-1.0.1.zip differ diff --git a/ios/manifest b/ios/manifest index 921a77e..0d85e58 100644 --- a/ios/manifest +++ b/ios/manifest @@ -15,4 +15,4 @@ name: ti.appcenter moduleid: ru.netris.mobile.appcenter guid: 0443bb65-2ff4-47a3-b9b0-e09f3b41b542 platform: iphone -minsdk: 7.4.1.GA +minsdk: 8.3.1.GA diff --git a/ios/titanium.xcconfig b/ios/titanium.xcconfig index 28fccf3..7d1030d 100644 --- a/ios/titanium.xcconfig +++ b/ios/titanium.xcconfig @@ -4,15 +4,14 @@ // OF YOUR TITANIUM SDK YOU'RE BUILDING FOR // // -TITANIUM_SDK_VERSION = 7.4.1.GA +TITANIUM_SDK_VERSION = 9.0.0.v20200224113949 // // THESE SHOULD BE OK GENERALLY AS-IS // -TITANIUM_SDK = $(HOME)/Library/Application Support/Titanium/mobilesdk/osx/7.4.1.GA +TITANIUM_SDK = $(HOME)/Library/Application Support/Titanium/mobilesdk/osx/9.0.0.v20200224113949 TITANIUM_BASE_SDK = "$(TITANIUM_SDK)/iphone/include" TITANIUM_BASE_SDK2 = "$(TITANIUM_SDK)/iphone/include/TiCore" TITANIUM_BASE_SDK3 = "$(TITANIUM_SDK)/iphone/include/JavaScriptCore" HEADER_SEARCH_PATHS= $(TITANIUM_BASE_SDK) $(TITANIUM_BASE_SDK2) $(TITANIUM_BASE_SDK3) - - +FRAMEWORK_SEARCH_PATHS = $(inherited) "$(TITANIUM_SDK)/iphone/Frameworks" \ No newline at end of file