diff --git a/.gitignore b/.gitignore index 9c17ca5..71b91f8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,24 +1,74 @@ #-----------------------------------------# -#.npmrc -#dist/ -#example/ -#node_modules/ -#android/.idea/ -#android/.gradle -#android/build/ -#android/libs/ -#android/*.iml -#android/local.properties -#android/.settings -#android/.project -#android/.classpath -#demo/android/app/build/ -#demo/android/.gradle/ - -#package-lock.json +# OSX +# +.DS_Store + +# Xcode +# +build/ +*.pbxuser +!default.pbxuser +*.mode1v3 +!default.mode1v3 +*.mode2v3 +!default.mode2v3 +*.perspectivev3 +!default.perspectivev3 +xcuserdata +*.xccheckout +*.moved-aside +DerivedData +*.hmap +*.ipa +*.xcuserstate +ios/.xcode.env.local + +# Android/IntelliJ +# +build/ +.idea +.gradle +local.properties +*.iml +*.hprof +.cxx/ +*.keystore +!debug.keystore + +# node.js +# +node_modules/ +npm-debug.log +yarn-error.log + +# fastlane +# +# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the +# screenshots whenever they are needed. +# For more information about the recommended setup visit: +# https://docs.fastlane.tools/best-practices/source-control/ + +**/fastlane/report.xml +**/fastlane/Preview.html +**/fastlane/screenshots +**/fastlane/test_output + +# Bundle artifact +*.jsbundle + +# Ruby / CocoaPods +/ios/Pods/ +/vendor/bundle/ + +# Temporary files created by Metro to check the health of the file watcher +.metro-health-check* + +# testing +/coverage #-----------------------------------------# + /demo/ /sdk/dist/ /sdk/node_modules/ diff --git a/demo/package.json b/demo/package.json index 1db9583..a2f5cf7 100644 --- a/demo/package.json +++ b/demo/package.json @@ -10,7 +10,7 @@ "lint": "eslint . --ext .js,.jsx,.ts,.tsx" }, "dependencies": { - "@react-native-async-storage/async-storage": "^1.13.3", + "@react-native-async-storage/async-storage": "1.13.3", "@react-native-community/checkbox": "^0.5.7", "@react-navigation/bottom-tabs": "^5.11.7", "@react-navigation/native": "^5.9.2", diff --git a/sdk/android/build.gradle b/sdk/android/build.gradle index 48fb650..6d45e17 100644 --- a/sdk/android/build.gradle +++ b/sdk/android/build.gradle @@ -11,7 +11,7 @@ // - 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_BUILD_TOOLS_VERSION = '30.0.3' def DEFAULT_MIN_SDK_VERSION = 19 def DEFAULT_TARGET_SDK_VERSION = 28 @@ -33,7 +33,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:3.4.1' + classpath 'com.android.tools.build:gradle:7.4.2' } } } @@ -42,7 +42,6 @@ apply plugin: 'com.android.library' apply plugin: 'maven-publish' android { - namespace 'com.raygun.react' compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION) buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION) defaultConfig { @@ -114,7 +113,7 @@ afterEvaluate { project -> version packageJson.version pom { - name = packageJson.title + name = packageJson.title group = "com.raygun.react" description = packageJson.description url = packageJson.repository.baseUrl diff --git a/sdk/android/gradle.properties b/sdk/android/gradle.properties new file mode 100644 index 0000000..1143715 --- /dev/null +++ b/sdk/android/gradle.properties @@ -0,0 +1,4 @@ +# Enable use of AndroidX dependencies +android.useAndroidX=true +# Enable Jetifier to automatically convert existing third-party libraries to use AndroidX +android.enableJetifier=true diff --git a/sdk/android/gradle/wrapper/gradle-wrapper.jar b/sdk/android/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index e708b1c..0000000 Binary files a/sdk/android/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/sdk/android/gradle/wrapper/gradle-wrapper.properties b/sdk/android/gradle/wrapper/gradle-wrapper.properties index 4d9ca16..068cdb2 100644 --- a/sdk/android/gradle/wrapper/gradle-wrapper.properties +++ b/sdk/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/sdk/android/src/main/AndroidManifest.xml b/sdk/android/src/main/AndroidManifest.xml new file mode 100644 index 0000000..70210bf --- /dev/null +++ b/sdk/android/src/main/AndroidManifest.xml @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/sdk/package.json b/sdk/package.json index de01846..4c961ae 100644 --- a/sdk/package.json +++ b/sdk/package.json @@ -44,6 +44,9 @@ "license": "MIT", "licenseFilename": "LICENSE", "readmeFilename": "README.md", + "dependencies": { + "@react-native-async-storage/async-storage": "^1.13.4" + }, "peerDependencies": { "@react-native-async-storage/async-storage": "^1.13.3" }, @@ -73,8 +76,5 @@ "run-script-os": "^1.1.5", "ts-jest": "^26.4.0", "typescript": "^3.9.7" - }, - "dependencies": { - "@react-native-async-storage/async-storage": "^1.13.4" } } diff --git a/sdk/raygun4reactnative.podspec b/sdk/raygun4reactnative.podspec index 2c5b7d2..1618d4b 100644 --- a/sdk/raygun4reactnative.podspec +++ b/sdk/raygun4reactnative.podspec @@ -15,14 +15,13 @@ Pod::Spec.new do |s| # optional - use expanded license entry instead: # s.license = { :type => "MIT", :file => "LICENSE" } s.authors = { "MindscapeHQ" => "hello@raygun.io" } - s.platforms = { :ios => "12.0" } + s.platforms = { :ios => "10.0" } s.source = { :git => "https://github.com/hunteva/raygun4reactnative.git", :branch => "kerwin/refactory/storage" } s.source_files = "ios/**/*.{h,c,m,swift}" s.requires_arc = true s.dependency "React-Core" - s.dependency "raygun4apple", '~> 2.0.0' + s.dependency "raygun4apple", '~> 1.5.1' end -