Skip to content

Commit 85904cd

Browse files
committed
Merge branch 'release/v5.0.1.201503'
2 parents d7a2f07 + bfe1f6e commit 85904cd

File tree

888 files changed

+26222
-48130
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

888 files changed

+26222
-48130
lines changed

README.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ JFugue-for-Android
44
[![Build Status](https://travis-ci.org/kshoji/JFugue-for-Android.svg?branch=master)](https://travis-ci.org/kshoji/JFugue-for-Android)
55

66
Music library [JFugue](http://www.jfugue.org/) porting for Android<br />
7-
Based on the version 4.0.3.
7+
Based on the version 5.0.1.
88

99
Usage
1010
=====
@@ -14,5 +14,6 @@ About the JFugue features, see [the original documents](http://www.jfugue.org/ex
1414

1515
License
1616
=======
17-
- JFugue for Android's license is same as the original, [LGPL](https://www.gnu.org/licenses/lgpl.html).
17+
- JFugue 4.x for Android's license is same as the original, [LGPL](https://www.gnu.org/licenses/lgpl.html).
18+
- JFugue 5.x for Android's license is same as the original, [Apache 2.0 License](http://www.apache.org/licenses/LICENSE-2.0).
1819
- Other modified referential library's license is also same as original. See each directories' license file for more information.

jfugue-android/build.gradle

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ android {
77
minSdkVersion 12
88
targetSdkVersion 19
99
versionCode 1
10-
versionName '4.0.3'
10+
versionName '5.0.1.201503'
1111
}
1212
buildTypes {
1313
release {
@@ -35,17 +35,17 @@ configurations.compile {
3535

3636
dependencies {
3737
compile fileTree(dir: 'libs', include: ['*.jar'])
38-
compile 'xom:xom:1.2.5'
39-
compile 'jp.kshoji:javax-sound-midi:0.0.1:@aar'
40-
compile project(':mod_xalan')
38+
compile 'com.io7m.xom:xom:1.2.10'
39+
compile 'jp.kshoji:javax-sound-midi:0.0.2:@aar'
40+
compile project(':mod_xmlapis')
4141
}
4242

4343
apply plugin: 'maven'
4444
group = 'jp.kshoji'
4545
uploadArchives {
4646
repositories {
4747
mavenDeployer {
48-
pom.version = '4.0.3'
48+
pom.version = '5.0.1.201503'
4949
pom.artifactId = 'jfugue-android'
5050
repository url: 'file://' + file('snapshot').absolutePath
5151
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
4a228fef7c52f07ee1dfafcfde5451a3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
c645c1cd590bd035f1304a00e5532470e18dd79c
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<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"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4+
<modelVersion>4.0.0</modelVersion>
5+
<groupId>jp.kshoji</groupId>
6+
<artifactId>jfugue-android</artifactId>
7+
<version>5.0.1.201503</version>
8+
<packaging>aar</packaging>
9+
<dependencies>
10+
<dependency>
11+
<groupId>com.io7m.xom</groupId>
12+
<artifactId>xom</artifactId>
13+
<version>1.2.10</version>
14+
<scope>compile</scope>
15+
</dependency>
16+
<dependency>
17+
<groupId>JFugue-for-Android</groupId>
18+
<artifactId>mod_xmlapis</artifactId>
19+
<version>unspecified</version>
20+
<scope>compile</scope>
21+
</dependency>
22+
<dependency>
23+
<groupId>jp.kshoji</groupId>
24+
<artifactId>javax-sound-midi</artifactId>
25+
<version>0.0.2</version>
26+
<type>aar</type>
27+
<scope>compile</scope>
28+
</dependency>
29+
</dependencies>
30+
</project>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1a12d587d9205d216f4cff00fe02c4ae
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
6f732da7bc7ebb68a314bcc20325a68ad264c615

jfugue-android/snapshot/jp/kshoji/jfugue-android/maven-metadata.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
<versions>
88
<version>0.0.1-SNAPSHOT</version>
99
<version>4.0.3</version>
10+
<version>5.0.1.201503</version>
1011
</versions>
11-
<lastUpdated>20150220103148</lastUpdated>
12+
<lastUpdated>20150324090936</lastUpdated>
1213
</versioning>
1314
</metadata>
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2d0df02f0edbad516f45fcdd03f153fe
1+
7d9d6408526c12b4303114e8bf9e2119
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5d8a8ec6a47ef4ba166c9ff79f73b5066a43a3f2
1+
a96331459c379293ae8a38be7edcabaaaf4b3522

jfugue-android/src/main/java/org/jfugue/Anticipator.java

-84
This file was deleted.

jfugue-android/src/main/java/org/jfugue/ChannelPressure.java

-89
This file was deleted.

jfugue-android/src/main/java/org/jfugue/CollatedParserListener.java

-112
This file was deleted.

0 commit comments

Comments
 (0)