Skip to content

Commit a1e97bb

Browse files
committed
- upgrading ios and android native libraries
- upgrading gradle version - migrating to pod-installer - bumping version
1 parent afd027f commit a1e97bb

8 files changed

Lines changed: 28 additions & 141 deletions

File tree

Example/android/app/build.gradle

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,13 @@ def enableSeparateBuildPerCPUArchitecture = false
9494
def enableProguardInReleaseBuilds = false
9595

9696
android {
97-
compileSdkVersion 25
98-
buildToolsVersion '25.0.3'
97+
compileSdkVersion 27
98+
buildToolsVersion '28.0.3'
9999

100100
defaultConfig {
101101
applicationId "com.example"
102102
minSdkVersion 16
103-
targetSdkVersion 25
103+
targetSdkVersion 27
104104
versionCode 1
105105
versionName "1.0"
106106
ndk {
@@ -137,10 +137,10 @@ android {
137137
}
138138

139139
dependencies {
140-
compile project(':react-native-styled-dialogs')
141-
compile fileTree(dir: "libs", include: ["*.jar"])
142-
compile "com.android.support:appcompat-v7:25.1.1"
143-
compile "com.facebook.react:react-native:+" // From node_modules
140+
implementation project(':react-native-styled-dialogs')
141+
implementation fileTree(dir: "libs", include: ["*.jar"])
142+
implementation "com.android.support:appcompat-v7:27.1.1"
143+
implementation "com.facebook.react:react-native:+" // From node_modules
144144
}
145145

146146
// Run this once to be able to run the application with BUCK

Example/android/build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22

33
buildscript {
44
repositories {
5+
google()
56
jcenter()
67
}
78
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.2.3'
9+
classpath 'com.android.tools.build:gradle:3.2.1'
910

1011
// NOTE: Do not place your application dependencies here; they belong
1112
// in the individual module build.gradle files
@@ -14,14 +15,15 @@ buildscript {
1415

1516
allprojects {
1617
repositories {
18+
google()
1719
mavenLocal()
18-
jcenter()
1920
maven {
2021
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
2122
url "$rootDir/../node_modules/react-native/android"
2223
}
2324
maven {
2425
url "https://jitpack.io"
2526
}
27+
jcenter()
2628
}
2729
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Fri Apr 20 10:07:16 IST 2018
1+
#Sat Nov 24 17:18:33 IST 2018
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

android/build.gradle

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
11

22
buildscript {
33
repositories {
4+
google()
45
jcenter()
56
}
67

78
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.2.3'
9+
classpath 'com.android.tools.build:gradle:3.2.1'
910
}
1011
}
1112

1213
apply plugin: 'com.android.library'
1314

1415
android {
15-
compileSdkVersion 25
16-
buildToolsVersion '25.0.3'
16+
compileSdkVersion 27
17+
buildToolsVersion '28.0.3'
1718

1819
defaultConfig {
1920
minSdkVersion 16
20-
targetSdkVersion 25
21+
targetSdkVersion 27
2122
versionCode 1
2223
versionName "1.0"
2324
}
@@ -27,12 +28,11 @@ android {
2728
}
2829

2930
repositories {
31+
google()
3032
mavenCentral()
3133
}
3234

3335
dependencies {
34-
compile 'com.facebook.react:react-native:+'
35-
compile 'com.github.javiersantos:MaterialStyledDialogs:2.1'
36-
}
37-
38-
36+
implementation 'com.facebook.react:react-native:+'
37+
implementation 'com.github.javiersantos:MaterialStyledDialogs:2.1'
38+
}

ios/Podfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ target 'RNStyledDialogs' do
77

88
# Pods for RNStyledDialogs
99

10-
pod 'PMAlertController'
10+
pod 'PMAlertController', '~> 3.5.0'
1111

1212
post_install do |installer|
1313
installer.pods_project.targets.each do |target|
1414
if target.name.include?('PMAlertController')
1515
target.build_configurations.each do |config|
16-
config.build_settings['SWIFT_VERSION'] = '4.1'
16+
config.build_settings['SWIFT_VERSION'] = '4.2'
1717
end
1818
end
1919
end

ios/RNStyledDialogs.xcodeproj/project.pbxproj

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@
129129
58B511D71A9E6C8500147676 /* Sources */,
130130
58B511D81A9E6C8500147676 /* Frameworks */,
131131
58B511D91A9E6C8500147676 /* CopyFiles */,
132-
C135BBB0B9435C9394C6E5F3 /* [CP] Copy Pods Resources */,
133132
);
134133
buildRules = (
135134
);
@@ -220,21 +219,6 @@
220219
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
221220
showEnvVarsInLog = 0;
222221
};
223-
C135BBB0B9435C9394C6E5F3 /* [CP] Copy Pods Resources */ = {
224-
isa = PBXShellScriptBuildPhase;
225-
buildActionMask = 2147483647;
226-
files = (
227-
);
228-
inputPaths = (
229-
);
230-
name = "[CP] Copy Pods Resources";
231-
outputPaths = (
232-
);
233-
runOnlyForDeploymentPostprocessing = 0;
234-
shellPath = /bin/sh;
235-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-RNStyledDialogs/Pods-RNStyledDialogs-resources.sh\"\n";
236-
showEnvVarsInLog = 0;
237-
};
238222
/* End PBXShellScriptBuildPhase section */
239223

240224
/* Begin PBXSourcesBuildPhase section */

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11

22
{
33
"name": "react-native-styled-dialogs",
4-
"version": "0.0.5",
4+
"version": "0.0.6",
55
"description": "React Native: Native Styled Dialogs",
66
"main": "RNStyledDialogs.js",
77
"scripts": {
88
"test": "echo \"Error: no test specified\" && exit 1",
9-
"postinstall": "node scripts/installer.js"
9+
"postinstall": "node ../pod-installer/index.js"
1010
},
1111
"keywords": [
1212
"react-native"
@@ -16,8 +16,9 @@
1616
"peerDependencies": {
1717
},
1818
"dependencies": {
19+
"pod-installer": "0.0.0"
1920
},
2021
"devDependencies": {
21-
"prettier-pack": "0.0.7"
22+
"prettier-pack": "0.0.8"
2223
}
2324
}

scripts/installer.js

Lines changed: 0 additions & 100 deletions
This file was deleted.

0 commit comments

Comments
 (0)