Skip to content

fix: adjust compatibility with React Native #261

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wesleyglima wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: adjust compatibility with React Native #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
buildscript {
repositories {
jcenter { url "http://jcenter.bintray.com/" }
maven {url "http://repo.spring.io/plugins-release/"}
google()
jcenter { url "https://jcenter.bintray.com/" }
maven {url "https://repo.spring.io/plugins-release/"}
mavenCentral()
maven {
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
Expand All @@ -20,7 +21,7 @@ buildscript {
apply plugin: 'com.android.library'

android {
compileSdkVersion 28
compileSdkVersion 30
buildToolsVersion "28.0.3"

defaultConfig {
Expand All @@ -40,8 +41,8 @@ android {
}

repositories {
jcenter { url "http://jcenter.bintray.com/" }
maven {url "http://repo.spring.io/plugins-release/"}
jcenter { url "https://jcenter.bintray.com/" }
maven {url "https://repo.spring.io/plugins-release/"}
mavenCentral()
maven {
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
Expand All @@ -53,8 +54,7 @@ repositories {
}

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.facebook.react:react-native:+' // From node_modules
implementation group: 'com.android.support', name: 'support-v4', version: '27.0.0'
implementation "com.google.zxing:core:3.3.0"
}
}
4 changes: 2 additions & 2 deletions android/src/main/java/cn/jystudio/bluetooth/RNBluetoothManagerModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
import android.content.IntentFilter;
import android.content.pm.PackageManager;
import android.os.Bundle;
import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat;
import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat;
import android.util.Log;
import android.widget.Toast;

Expand Down