Skip to content

Commit

Permalink
- upgrading native libraries
Browse files Browse the repository at this point in the history
- upgrading gradle version
  • Loading branch information
prscms committed Dec 1, 2018
1 parent 693a996 commit c39f2dd
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 119 deletions.
13 changes: 7 additions & 6 deletions Example/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,13 @@ def enableSeparateBuildPerCPUArchitecture = false
def enableProguardInReleaseBuilds = false

android {
compileSdkVersion 27
compileSdkVersion 28
buildToolsVersion '28.0.3'

defaultConfig {
applicationId "com.example"
minSdkVersion 16
targetSdkVersion 27
targetSdkVersion 28
versionCode 1
versionName "1.0"
ndk {
Expand Down Expand Up @@ -139,10 +139,11 @@ android {
}

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

// Run this once to be able to run the application with BUCK
Expand Down
6 changes: 4 additions & 2 deletions Example/android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,16 @@
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>

<uses-sdk android:targetSdkVersion="22" />
<uses-sdk android:targetSdkVersion="28" />

<application
android:name=".MainApplication"
android:allowBackup="true"
android:label="@string/app_name"
android:icon="@mipmap/ic_launcher"
android:theme="@style/AppTheme">
android:theme="@style/AppTheme"
android:usesCleartextTraffic="true"
>
<activity
android:name=".MainActivity"
android:label="@string/app_name"
Expand Down
1 change: 1 addition & 0 deletions Example/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ buildscript {

allprojects {
repositories {
google()
mavenLocal()
maven { url "https://maven.google.com" }
maven {
Expand Down
2 changes: 1 addition & 1 deletion Example/android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
11 changes: 6 additions & 5 deletions 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 All @@ -13,12 +14,12 @@ buildscript {
apply plugin: 'com.android.library'

android {
compileSdkVersion 27
compileSdkVersion 28
buildToolsVersion '28.0.3'

defaultConfig {
minSdkVersion 16
targetSdkVersion 27
targetSdkVersion 28
versionCode 1
versionName "1.0"
}
Expand All @@ -28,13 +29,13 @@ android {
}

repositories {
google()
maven { url "https://maven.google.com" }
mavenCentral()
}

dependencies {
implementation project(':react-native-vector-icons')
implementation 'com.facebook.react:react-native:+'
implementation 'com.github.zawadz88.materialpopupmenu:material-popup-menu:1.4.1'
compile 'com.android.support:appcompat-v7:27.0.2'
implementation project(':react-native-vector-icons')
implementation 'com.github.zawadz88.materialpopupmenu:material-popup-menu:2.2.0'
}
2 changes: 1 addition & 1 deletion ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ target 'RNPopoverMenu' do

# Pods for RNPopoverMenu

pod 'FTPopOverMenu', '1.3.6'
pod 'FTPopOverMenu', '~> 2.0.2'
end
2 changes: 1 addition & 1 deletion ios/RNPopoverMenu.m
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ - (dispatch_queue_t)methodQueue {
configuration.selectedCellBackgroundColor = selectedRowBackgroundColr;
configuration.allowRoundedArrow = [roundedArrow boolValue];
// configuration.textFont = ...
configuration.tintColor = tintColr;
configuration.backgroundColor = tintColr;
configuration.borderColor = borderColr;
configuration.borderWidth = [borderWidth longValue];
configuration.separatorColor = separatorColr;
Expand Down
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@

{
"name": "react-native-popover-menu",
"version": "0.0.20",
"version": "0.0.21",
"description": "React Native: Native Popover Menu",
"main": "js/RNPopoverMenu.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
"postinstall": "node scripts/installer.js"
"postinstall": "node ../pod-installer/index.js"
},
"keywords": ["react-native"],
"author": "Pranav Raj Singh Chauhan",
Expand All @@ -16,10 +16,11 @@
"url": "https://github.com/prscX/react-native-popover-menu.git"
},
"dependencies": {
"pod-installer": "0.0.0",
"react-native-vector-icons": "5.0.0"
},
"devDependencies": {
"prettier-pack": "0.0.7"
"prettier-pack": "0.0.8"
},
"peerDependencies": {}
}
100 changes: 0 additions & 100 deletions scripts/installer.js

This file was deleted.

0 comments on commit c39f2dd

Please sign in to comment.