Merge branch 'release/v0.1.2'

Conflicts:
	MIDIDriver/build.gradle
	MIDIDriver/snapshots/jp/kshoji/midi-driver/maven-metadata.xml
	MIDIDriver/snapshots/jp/kshoji/midi-driver/maven-metadata.xml.md5
	MIDIDriver/snapshots/jp/kshoji/midi-driver/maven-metadata.xml.sha1

.travis.yml

@@ -4,7 +4,7 @@ android:
   components:
     - build-tools-21.1.2
     - extra-android-m2repository
-    - android-12
+    - android-21
   licenses:
     - '.+'
 before_install:

MIDIDriver/build.gradle

@@ -9,14 +9,19 @@ repositories {
 }
 
 dependencies {
-    compile 'jp.kshoji:javax-sound-midi:0.0.1:@aar'
+    compile 'jp.kshoji:javax-sound-midi:0.0.2:@aar'
+    compile 'com.android.support:support-annotations:21.0.3'
     compile fileTree(dir: 'libs', include: '*.jar')
 }
 
 android {
-    compileSdkVersion 12
+    compileSdkVersion 21
     buildToolsVersion "21.1.2"
 
+    defaultConfig {
+        minSdkVersion 12
+    }
+
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'
@@ -47,7 +52,7 @@ group = 'jp.kshoji'
 uploadArchives {
     repositories.mavenDeployer {
         repository url: 'file://' + file('snapshots').absolutePath
-        pom.version = '0.1.1'
+        pom.version = '0.1.2'
         pom.artifactId = 'midi-driver'
     }
 }

MIDIDriver/snapshots/jp/kshoji/midi-driver/0.0.4-SNAPSHOT/maven-metadata.xml

@@ -5,9 +5,9 @@
   <version>0.0.4-SNAPSHOT</version>
   <versioning>
     <snapshot>
-      <timestamp>20140829.040140</timestamp>
-      <buildNumber>1</buildNumber>
+      <timestamp>20150223.090813</timestamp>
+      <buildNumber>2</buildNumber>
     </snapshot>
-    <lastUpdated>20140829040140</lastUpdated>
+    <lastUpdated>20150223090813</lastUpdated>
   </versioning>
 </metadata>

MIDIDriver/snapshots/jp/kshoji/midi-driver/0.0.4-SNAPSHOT/maven-metadata.xml.md5

@@ -1 +1 @@
-c358df4bb43b004dbba03b6df879140a
+4760dcdb2b96c354840c99090c8d4dd8

MIDIDriver/snapshots/jp/kshoji/midi-driver/0.0.4-SNAPSHOT/maven-metadata.xml.sha1

@@ -1 +1 @@
-b5559f5bb570f6cf22404d7c5afd4c0d304f6379
+86979dc33d2bd1cec95748eccbabf0753be8ca46

MIDIDriver/snapshots/jp/kshoji/midi-driver/0.0.4-SNAPSHOT/midi-driver-0.0.4-20150223.090813-2.aar.md5

@@ -0,0 +1 @@
+c7b90d02abdda167f43b7cbd8682a74b

MIDIDriver/snapshots/jp/kshoji/midi-driver/0.0.4-SNAPSHOT/midi-driver-0.0.4-20150223.090813-2.aar.sha1

@@ -0,0 +1 @@
+332677a1fcda2b8944e89572c7e97f568135b7df

MIDIDriver/snapshots/jp/kshoji/midi-driver/0.0.4-SNAPSHOT/midi-driver-0.0.4-20150223.090813-2.pom

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>jp.kshoji</groupId>
+  <artifactId>midi-driver</artifactId>
+  <version>0.0.4-SNAPSHOT</version>
+  <packaging>aar</packaging>
+  <dependencies>
+    <dependency>
+      <groupId>jp.kshoji</groupId>
+      <artifactId>javax-sound-midi</artifactId>
+      <version>0.0.2-SNAPSHOT</version>
+      <type>aar</type>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.support</groupId>
+      <artifactId>support-annotations</artifactId>
+      <version>21.0.3</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+</project>

MIDIDriver/snapshots/jp/kshoji/midi-driver/0.0.4-SNAPSHOT/midi-driver-0.0.4-20150223.090813-2.pom.md5

@@ -0,0 +1 @@
+6084a97c73c0f098ead5f6de15fddbd2

MIDIDriver/snapshots/jp/kshoji/midi-driver/0.0.4-SNAPSHOT/midi-driver-0.0.4-20150223.090813-2.pom.sha1

@@ -0,0 +1 @@
+bbde25b80aee880b37834a7c8950dae3ed3168fb

MIDIDriver/snapshots/jp/kshoji/midi-driver/0.1.2/midi-driver-0.1.2.aar.md5

@@ -0,0 +1 @@
+e953ffa1b8dbc99e2d0dcd2d92598153

MIDIDriver/snapshots/jp/kshoji/midi-driver/0.1.2/midi-driver-0.1.2.aar.sha1

@@ -0,0 +1 @@
+dd6237ac8787a0e34322da854f045c085f1caca0

MIDIDriver/snapshots/jp/kshoji/midi-driver/0.1.2/midi-driver-0.1.2.pom

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>jp.kshoji</groupId>
+  <artifactId>midi-driver</artifactId>
+  <version>0.1.2</version>
+  <packaging>aar</packaging>
+  <dependencies>
+    <dependency>
+      <groupId>jp.kshoji</groupId>
+      <artifactId>javax-sound-midi</artifactId>
+      <version>0.0.2</version>
+      <type>aar</type>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.support</groupId>
+      <artifactId>support-annotations</artifactId>
+      <version>21.0.3</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+</project>

MIDIDriver/snapshots/jp/kshoji/midi-driver/0.1.2/midi-driver-0.1.2.pom.md5

@@ -0,0 +1 @@
+a28b83624c0063a785668fdd2f3406fd

MIDIDriver/snapshots/jp/kshoji/midi-driver/0.1.2/midi-driver-0.1.2.pom.sha1

@@ -0,0 +1 @@
+15be848c2085a2519c1cd1d9a94a762c6c7e466e

MIDIDriver/snapshots/jp/kshoji/midi-driver/maven-metadata.xml

@@ -12,7 +12,8 @@
       <version>0.0.3</version>
       <version>0.0.4-SNAPSHOT</version>
       <version>0.1.1</version>
+      <version>0.1.2</version>
     </versions>
-    <lastUpdated>20150202032627</lastUpdated>
+    <lastUpdated>20150302030545</lastUpdated>
   </versioning>
 </metadata>

MIDIDriver/snapshots/jp/kshoji/midi-driver/maven-metadata.xml.md5

@@ -1 +1 @@
-603df2f4dc06a2e5b764f4cfc5b694c4
+9989e16c8728bfc548bd5499d319909f

MIDIDriver/snapshots/jp/kshoji/midi-driver/maven-metadata.xml.sha1

@@ -1 +1 @@
-989af17837a75d01f4dd7cf5fd27a95655ee21d1
+b263c23ac20b6d589e3404260913f11ce7afffb9