Skip to content

Commit

Permalink
- upgrading ios and android native libraries
Browse files Browse the repository at this point in the history
- upgrading gradle version
  • Loading branch information
prscms committed Nov 24, 2018
1 parent 322326d commit 4df80cb
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
8 changes: 4 additions & 4 deletions Example/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,10 @@ android {
}

dependencies {
compile project(':react-native-app-tour')
compile fileTree(dir: "libs", include: ["*.jar"])
compile "com.android.support:appcompat-v7:27.0.2"
compile "com.facebook.react:react-native:+" // From node_modules
implementation project(':react-native-app-tour')
implementation fileTree(dir: "libs", include: ["*.jar"])
implementation "com.android.support:appcompat-v7:27.0.2"
implementation "com.facebook.react:react-native:+" // From node_modules
}

// Run this once to be able to run the application with BUCK
Expand Down
3 changes: 2 additions & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@

buildscript {
repositories {
google()
maven { url "https://maven.google.com" }
jcenter()
}
Expand Down Expand Up @@ -35,5 +36,5 @@ repositories {

dependencies {
implementation 'com.facebook.react:react-native:+'
implementation 'com.getkeepsafe.taptargetview:taptargetview:1.11.0'
implementation 'com.getkeepsafe.taptargetview:taptargetview:1.12.0'
}
15 changes: 7 additions & 8 deletions ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,19 @@ platform :ios, '9.0'

target 'RNAppTour' do
# Uncomment the next line if you're using Swift or would like to use dynamic frameworks
# use_frameworks!

# Pods for RNAppTour
use_frameworks!

pod 'MaterialShowcase', '0.6.2'
pod 'MaterialShowcase', '~> 0.6.4'

post_install do |installer|
installer.pods_project.targets.each do |target|
if target.name.include?('MaterialShowcase')
target.build_configurations.each do |config|
config.build_settings['SWIFT_VERSION'] = '4.1'
end
post_install do |installer|
installer.pods_project.targets.each do |target|
if target.name.include?('MaterialShowcase')
target.build_configurations.each do |config|
config.build_settings['SWIFT_VERSION'] = '4.2'
end
end
end
end
end
2 changes: 1 addition & 1 deletion ios/RNAppTour.m
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ - (MaterialShowcase *)generateMaterialShowcase:(NSNumber *)view props:(NSDiction

if ([props objectForKey:@"cancelable"] != nil) {
BOOL *cancelable = [[props objectForKey:@"cancelable"] boolValue];
[materialShowcase setIsTapRecognizerForTagretView: !cancelable];
[materialShowcase setIsTapRecognizerForTargetView: !cancelable];
}

// Text
Expand Down

0 comments on commit 4df80cb

Please sign in to comment.