diff --git a/.gitignore b/.gitignore
index 6e915e6..8f73cec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,17 +1,37 @@
+# Built application files
+*.apk
+*.ap_
+
+# Files for the Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+
# Studio/Gradle
*.iml
.gradle/
build/
-# Intellij IDEA (see https://intellij-support.jetbrains.com/entries/23393067)
+# User-specific stuff:
.idea/workspace.xml
.idea/tasks.xml
-.idea/datasources.xml
-.idea/dataSources.ids
+.idea/dictionaries
-# generated files
-bin/
-gen/
+# Sensitive or high-churn files:
+.idea/dataSources.ids
+.idea/dataSources.xml
+.idea/sqlDataSources.xml
+.idea/dynamic.xml
+.idea/uiDesigner.xml
+
+# Gradle:
+.idea/gradle.xml
+.idea/libraries
# Eclipse/Android/Misc
.metadata/
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 217af47..1f2af51 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,7 +1,6 @@
-
@@ -19,5 +18,4 @@
-
-
+
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index e206d70..0000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
deleted file mode 100644
index c464048..0000000
--- a/.idea/gradle.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
diff --git a/.idea/misc.xml b/.idea/misc.xml
index e92d1ca..aaaf922 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,8 +1,5 @@
-
-
-
@@ -16,106 +13,17 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- localhost
- 5050
-
+
+
- Android API 19 Platform
+ 1.8
@@ -127,5 +35,4 @@
-
-
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index bdbfa79..b3a50a0 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -7,5 +7,4 @@
-
-
+
\ No newline at end of file
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b..0000000
--- a/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index def6a6a..35eb1dd 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,7 +1,6 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 45ba66b..0c42278 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.12.2'
+ classpath 'com.android.tools.build:gradle:1.2.3'
}
}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c2eadf5..f3d36d0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Sep 08 10:16:24 PDT 2014
+#Tue Jun 23 00:11:28 EDT 2015
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
diff --git a/usbSerialExamples/build.gradle b/usbSerialExamples/build.gradle
index 1b0cf6a..2da9b1c 100644
--- a/usbSerialExamples/build.gradle
+++ b/usbSerialExamples/build.gradle
@@ -1,20 +1,20 @@
-apply plugin: 'android'
+apply plugin: 'com.android.application'
android {
- compileSdkVersion 19
- buildToolsVersion "19.1"
+ compileSdkVersion 22
+ buildToolsVersion "22.0.1"
defaultConfig {
minSdkVersion 14
- targetSdkVersion 19
+ targetSdkVersion 22
- testPackageName "com.hoho.android.usbserial.examples"
+ testApplicationId "com.hoho.android.usbserial.examples"
testInstrumentationRunner "android.test.InstrumentationTestRunner"
}
buildTypes {
release {
- runProguard true
+ minifyEnabled true
}
}
}
diff --git a/usbSerialForAndroid/build.gradle b/usbSerialForAndroid/build.gradle
index 63ed993..c3d835c 100644
--- a/usbSerialForAndroid/build.gradle
+++ b/usbSerialForAndroid/build.gradle
@@ -1,4 +1,4 @@
-apply plugin: 'android-library'
+apply plugin: 'com.android.library'
apply plugin: 'maven'
apply plugin: 'signing'
@@ -13,7 +13,7 @@ android {
buildTypes {
release {
- runProguard false
+ minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
}
}