From 71a978118021e9729a70f35225785f6542e9de60 Mon Sep 17 00:00:00 2001 From: Dennis Paler Date: Tue, 17 Sep 2019 15:19:25 +0800 Subject: [PATCH] update gradle to change compile to implementation --- android/build.gradle | 28 +++++++++++-------- .../pinmi/react/printer/RNPrinterModule.java | 4 --- .../pinmi/react/printer/RNPrinterPackage.java | 3 -- index.js | 1 - package.json | 4 +-- 5 files changed, 18 insertions(+), 22 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index f97adc1..19922bc 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,14 +1,18 @@ apply plugin: 'com.android.library' +def DEFAULT_COMPILE_SDK_VERSION = 27 +def DEFAULT_BUILD_TOOLS_VERSION = '25.0.3' +def DEFAULT_TARGET_SDK_VERSION = 27 + android { - compileSdkVersion 26 - buildToolsVersion "26.0.1" + compileSdkVersion project.hasProperty('compileSdkVersion') ? project.compileSdkVersion : DEFAULT_COMPILE_SDK_VERSION + buildToolsVersion project.hasProperty('buildToolsVersion') ? project.buildToolsVersion : DEFAULT_BUILD_TOOLS_VERSION defaultConfig { - minSdkVersion 15 - targetSdkVersion 26 - versionCode 1 - versionName "1.0" + minSdkVersion 16 + targetSdkVersion project.hasProperty('targetSdkVersion') ? project.targetSdkVersion : DEFAULT_TARGET_SDK_VERSION + versionCode 2 + versionName "1.1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -18,15 +22,15 @@ android { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } - } + } } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + implementation fileTree(dir: 'libs', include: ['*.jar']) + androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.2', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile 'com.android.support:appcompat-v7:21.2.1' - compile "com.facebook.react:react-native:+" - testCompile 'junit:junit:4.12' + implementation 'com.android.support:appcompat-v7:26.1' + implementation "com.facebook.react:react-native:+" + testImplementation 'junit:junit:4.12' } diff --git a/android/src/main/java/com/pinmi/react/printer/RNPrinterModule.java b/android/src/main/java/com/pinmi/react/printer/RNPrinterModule.java index e02c9b9..ee140a0 100644 --- a/android/src/main/java/com/pinmi/react/printer/RNPrinterModule.java +++ b/android/src/main/java/com/pinmi/react/printer/RNPrinterModule.java @@ -14,10 +14,6 @@ import java.util.List; -/** - * Created by bondwp322 on 2017/10/9. - */ - public class RNPrinterModule extends ReactContextBaseJavaModule { diff --git a/android/src/main/java/com/pinmi/react/printer/RNPrinterPackage.java b/android/src/main/java/com/pinmi/react/printer/RNPrinterPackage.java index b7938f3..08afedd 100644 --- a/android/src/main/java/com/pinmi/react/printer/RNPrinterPackage.java +++ b/android/src/main/java/com/pinmi/react/printer/RNPrinterPackage.java @@ -9,9 +9,6 @@ import java.util.Collections; import java.util.List; -/** - * Created by bondwp322 on 2017/10/9. - */ public class RNPrinterPackage implements ReactPackage { @Override diff --git a/index.js b/index.js index 514b2b4..086c056 100644 --- a/index.js +++ b/index.js @@ -1,6 +1,5 @@ import React, { NativeModules } from 'react-native'; - import EPToolkit from 'escpos-printer-toolkit'; var RNPrinter = NativeModules.RNPrinter; diff --git a/package.json b/package.json index 940a1eb..a6acd86 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "_from": "react-native-usb-printer", - "_id": "react-native-usb-printer@0.0.4", + "_id": "react-native-usb-printer@0.0.5", "_inBundle": false, "_integrity": "sha512-ddsDSxSjjXOZ0GMi+KY6qNbaYHhWHbg72IXsS6+27f1cMzvKjz34OyMH6QCFS32bCwfBut6yp/TR/6UOHz1YUA==", "_location": "/react-native-usb-printer", @@ -49,5 +49,5 @@ "scripts": { "test": "echo \"Error: no test specified\" && exit 1" }, - "version": "0.0.4" + "version": "0.0.5" }