Skip to content

Commit

Permalink
Merge pull request #77 from MindscapeHQ/js/update-gradle
Browse files Browse the repository at this point in the history
Prepare version 1.3.0
  • Loading branch information
redJ4y authored Nov 27, 2023
2 parents 2d1dcc2 + fc49fe5 commit 1af417d
Show file tree
Hide file tree
Showing 9 changed files with 82 additions and 29 deletions.
84 changes: 67 additions & 17 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -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/
Expand Down
2 changes: 1 addition & 1 deletion demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
7 changes: 3 additions & 4 deletions sdk/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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'
}
}
}
Expand All @@ -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 {
Expand Down Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions sdk/android/gradle.properties
Original file line number Diff line number Diff line change
@@ -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
Binary file removed sdk/android/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion sdk/android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions sdk/android/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<manifest package="com.raygun.react"></manifest>
6 changes: 3 additions & 3 deletions sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down Expand Up @@ -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"
}
}
5 changes: 2 additions & 3 deletions sdk/raygun4reactnative.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,13 @@ Pod::Spec.new do |s|
# optional - use expanded license entry instead:
# s.license = { :type => "MIT", :file => "LICENSE" }
s.authors = { "MindscapeHQ" => "[email protected]" }
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

0 comments on commit 1af417d

Please sign in to comment.