Depend directly on libwiiuse, correct version number

This commit is contained in:
2014-11-26 21:37:07 +00:00
parent 750f60caff
commit 5cbcb09c80
3 changed files with 19 additions and 8 deletions

4
.gitignore vendored
View File

@@ -5,5 +5,5 @@ bin
.project .project
.classpath .classpath
.maven .maven
/.gradle .gradle
/.classpath .classpath

View File

@@ -7,15 +7,18 @@ repositories {
maven { maven {
url 'https://github.com/Boukefalos/jlibloader/raw/mvn-repo/' url 'https://github.com/Boukefalos/jlibloader/raw/mvn-repo/'
} }
maven {
url 'https://github.com/Boukefalos/libwiiuse/raw/mvn-repo/'
}
} }
dependencies { dependencies {
compile 'com.github.boukefalos:jlibloader:0.1' compile 'com.github.boukefalos:libwiiuse:0.14'
} }
group = 'com.github.boukefalos' group = 'com.github.boukefalos'
project.archivesBaseName = 'jlibwiiuse' project.archivesBaseName = 'jlibwiiuse'
version = '0.13' version = '0.12'
task wrapper(type: Wrapper) { task wrapper(type: Wrapper) {
gradleVersion = '1.12' gradleVersion = '1.12'
@@ -130,7 +133,8 @@ binaries.withType(SharedLibraryBinary) { binary ->
jniPom.scopeMappings.mappings.clear() jniPom.scopeMappings.mappings.clear()
} }
def builderTask = binary.tasks.builder def builderTask = binary.tasks.builder
nativeJar.into(project.group.replace('.', '/') + '/' + variantName) { from builderTask.outputFile } def libraryDirectory = project.group.replace('.', '/') + "/${project.archivesBaseName}/${variantName}"
nativeJar.into(libraryDirectory) { from builderTask.outputFile }
nativeJar.dependsOn builderTask nativeJar.dependsOn builderTask
} }
@@ -150,6 +154,10 @@ mainPom.withXml { provider ->
} }
def dep = deps.appendNode('dependency') def dep = deps.appendNode('dependency')
dep.appendNode('groupId', 'com.github.boukefalos') dep.appendNode('groupId', 'com.github.boukefalos')
dep.appendNode('artifactId', 'jlibloader') dep.appendNode('artifactId', 'libwiiuse')
dep.appendNode('version', '0.1') dep.appendNode('version', '0.14')
}
jar {
from sourceSets.main.allSource
} }

View File

@@ -16,6 +16,8 @@
*/ */
package wiiusej; package wiiusej;
import com.github.boukefalos.jlibloader.Native;
import wiiusej.wiiusejevents.utils.EventsGatherer; import wiiusej.wiiusejevents.utils.EventsGatherer;
/** /**
@@ -26,7 +28,8 @@ import wiiusej.wiiusejevents.utils.EventsGatherer;
public class WiiUseApi { public class WiiUseApi {
static { static {
System.loadLibrary("WiiuseJ"); Native.load("com.github.boukefalos", "libwiiuse");
Native.load("com.github.boukefalos", "jlibwiiuse");
} }
private static WiiUseApi instance = new WiiUseApi(); private static WiiUseApi instance = new WiiUseApi();