Commit 3fb27f48 authored by wind.wang's avatar wind.wang

update to androidx

parent e3eae91f
node_modules/
.vscode/
android/build
android/.idea
\ No newline at end of file
connection.project.dir=../../../android
connection.project.dir=
eclipse.preferences.version=1
<?xml version="1.0" encoding="UTF-8"?>
<module external.system.id="GRADLE" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
<option name="GRADLE_PROJECT_PATH" value=":" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$" />
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
\ No newline at end of file
......@@ -12,8 +12,8 @@ android {
buildToolsVersion rootProject.hasProperty('buildToolsVersion') ? rootProject.buildToolsVersion : '28.0.3'
defaultConfig {
minSdkVersion 16
targetSdkVersion 28
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
......@@ -39,9 +39,9 @@ android {
}
dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
compile 'com.android.support:appcompat-v7:28.0.0'
compile 'com.facebook.react:react-native:+'
api fileTree(include: ['*.jar'], dir: 'libs')
implementation 'androidx.annotation:annotation:1.0.0'
implementation 'com.facebook.react:react-native:+'
// From node_moduless
compile 'com.google.code.gson:gson:2.5'
implementation 'com.google.code.gson:gson:2.5'
}
## This file must *NOT* be checked into Version Control Systems,
# as it contains information specific to your local configuration.
#
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
#Wed Jun 12 09:32:21 CST 2019
sdk.dir=/Users/wangduo/Development/android-sdk-macosx
......@@ -3,7 +3,8 @@ package com.rnsocial.pay;
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.Nullable;
//import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import com.rnsocial.SocialConfig;
import com.rnsocial.pay.channel.WechatPay;
......
......@@ -13,10 +13,10 @@
"ios",
"index.js"
],
"name": "react-native-social",
"name": "@hisense/react-native-social",
"scripts": {
"start": "react-native start",
"test": "jest"
},
"version": "1.2.6"
"version": "1.2.7"
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment