Skip to content
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.

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

Added support for Android 12 #186

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@

buildscript {
repositories {
jcenter()
mavenCentral()
google()
}

dependencies {
classpath 'com.android.tools.build:gradle:3.1.4'
classpath 'com.android.tools.build:gradle:4.0.1'
}
}

apply plugin: 'com.android.library'

def DEFAULT_COMPILE_SDK_VERSION = 28
def DEFAULT_BUILD_TOOLS_VERSION = '28.0.3'
def DEFAULT_TARGET_SDK_VERSION = 26
def DEFAULT_COMPILE_SDK_VERSION = 31
def DEFAULT_BUILD_TOOLS_VERSION = '31.0.0'
def DEFAULT_TARGET_SDK_VERSION = 31

android {
compileSdkVersion project.hasProperty('compileSdkVersion') ? project.compileSdkVersion : DEFAULT_COMPILE_SDK_VERSION
@@ -38,6 +38,6 @@ repositories {

dependencies {
implementation 'com.facebook.react:react-native:+'
implementation 'no.nordicsemi.android:dfu:1.8.0'
implementation 'no.nordicsemi.android:dfu:2.0.1'
}

5 changes: 2 additions & 3 deletions android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#Wed Nov 28 15:32:55 CET 2018
#Mon Jul 17 13:21:22 EEST 2023
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-native-nordic-dfu",
"version": "3.2.1",
"version": "3.2.2",
"description": "Nordic Device Firmware Update for React Native",
"main": "index.js",
"url": "https://github.com/Pilloxa/react-native-nordic-dfu",
@@ -21,10 +21,10 @@
"react-native": ">= 0.45.1"
},
"devDependencies": {
"documentation": "^4.0.0-rc.1",
"husky": "^0.13.3",
"lint-staged": "^3.4.0",
"prettier": "^1.2.2"
"documentation": "^13.2.5",
"husky": "^7.0.2",
"lint-staged": "^11.1.2",
"prettier": "^2.3.2"
},
"lint-staged": {
"*.js": [
Loading