Native libraries publishing artifacts, closes #43

This commit is contained in:
Emux
2016-07-04 12:41:56 +03:00
parent b3217ae2c0
commit c389abc7a2
32 changed files with 50 additions and 10 deletions

View File

@@ -9,6 +9,7 @@ if (project.hasProperty("android")) { // Android libraries
task javadoc(type: Javadoc) { task javadoc(type: Javadoc) {
source = android.sourceSets.main.java.srcDirs source = android.sourceSets.main.java.srcDirs
classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
exclude 'android-logger.properties'
} }
} else { // Java libraries } else { // Java libraries
task sourcesJar(type: Jar) { task sourcesJar(type: Jar) {

View File

@@ -5,7 +5,6 @@ dependencies {
compile project(':vtm-extras') compile project(':vtm-extras')
compile project(':vtm-jeo') compile project(':vtm-jeo')
compile project(':vtm-themes') compile project(':vtm-themes')
compile files("${rootDir}/vtm-android/vtm-natives-android.jar")
compile 'com.android.support:support-v4:24.0.0' compile 'com.android.support:support-v4:24.0.0'
compile 'com.android.support:appcompat-v7:24.0.0' compile 'com.android.support:appcompat-v7:24.0.0'
compile 'com.noveogroup.android:android-logger:1.3.6' compile 'com.noveogroup.android:android-logger:1.3.6'
@@ -33,6 +32,7 @@ android {
resources.srcDirs = ['src', 'assets'] resources.srcDirs = ['src', 'assets']
res.srcDirs = ['res'] res.srcDirs = ['res']
assets.srcDirs = ['assets'] assets.srcDirs = ['assets']
jniLibs.srcDirs = ["${rootDir}/vtm-android/natives/lib"]
} }
debug.setRoot('build-types/debug') debug.setRoot('build-types/debug')
release.setRoot('build-types/release') release.setRoot('build-types/release')

View File

@@ -4,9 +4,7 @@ apply plugin: 'com.github.dcendents.android-maven'
dependencies { dependencies {
compile project(':vtm-gdx') compile project(':vtm-gdx')
compile project(':vtm-themes') compile project(':vtm-themes')
compile files("${rootDir}/vtm-android/vtm-natives-android.jar")
compile "com.badlogicgames.gdx:gdx-backend-android:$gdxVersion" compile "com.badlogicgames.gdx:gdx-backend-android:$gdxVersion"
compile files('gdx-natives-android.jar')
compile 'com.noveogroup.android:android-logger:1.3.6' compile 'com.noveogroup.android:android-logger:1.3.6'
} }
@@ -34,6 +32,7 @@ android {
renderscript.srcDirs = ['src', 'assets'] renderscript.srcDirs = ['src', 'assets']
res.srcDirs = ['res'] res.srcDirs = ['res']
assets.srcDirs = ['assets'] assets.srcDirs = ['assets']
jniLibs.srcDirs = ['natives/lib', "${rootDir}/vtm-android/natives/lib"]
} }
debug.setRoot('build-types/debug') debug.setRoot('build-types/debug')
release.setRoot('build-types/release') release.setRoot('build-types/release')
@@ -54,6 +53,18 @@ android.applicationVariants.all { variant ->
artifacts.add('archives', task); artifacts.add('archives', task);
} }
android.applicationVariants.all { variant ->
def name = variant.buildType.name
if (name.equals("debug")) {
print "Skipping debug jar"
return; // Skip debug builds.
}
def task = project.tasks.create "nativesJar${name.capitalize()}", Jar
task.classifier = 'natives'
task.from('natives')
artifacts.add('archives', task);
}
task run(dependsOn: 'installDebug') { task run(dependsOn: 'installDebug') {
doFirst { doFirst {
println(">> adb run...") println(">> adb run...")

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -3,7 +3,6 @@ apply plugin: 'com.android.application'
dependencies { dependencies {
compile project(':vtm-android') compile project(':vtm-android')
compile project(':vtm-themes') compile project(':vtm-themes')
compile files("${rootDir}/vtm-android/vtm-natives-android.jar")
compile 'com.android.support:support-v4:24.0.0' compile 'com.android.support:support-v4:24.0.0'
compile 'com.android.support:appcompat-v7:24.0.0' compile 'com.android.support:appcompat-v7:24.0.0'
compile 'com.noveogroup.android:android-logger:1.3.6' compile 'com.noveogroup.android:android-logger:1.3.6'
@@ -31,6 +30,7 @@ android {
resources.srcDirs = ['src', 'assets'] resources.srcDirs = ['src', 'assets']
res.srcDirs = ['res'] res.srcDirs = ['res']
assets.srcDirs = ['assets'] assets.srcDirs = ['assets']
jniLibs.srcDirs = ["${rootDir}/vtm-android/natives/lib"]
} }
debug.setRoot('build-types/debug') debug.setRoot('build-types/debug')
release.setRoot('build-types/release') release.setRoot('build-types/release')

View File

@@ -47,6 +47,18 @@ android.libraryVariants.all { variant ->
artifacts.add('archives', task); artifacts.add('archives', task);
} }
android.libraryVariants.all { variant ->
def name = variant.buildType.name
if (name.equals("debug")) {
print "Skipping debug jar"
return; // Skip debug builds.
}
def task = project.tasks.create "nativesJar${name.capitalize()}", Jar
task.classifier = 'natives'
task.from('natives')
artifacts.add('archives', task);
}
// Automated Gradle project deployment to Sonatype OSSRH // Automated Gradle project deployment to Sonatype OSSRH
if (isReleaseVersion && project.hasProperty("SONATYPE_USERNAME")) { if (isReleaseVersion && project.hasProperty("SONATYPE_USERNAME")) {
afterEvaluate { afterEvaluate {

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -5,14 +5,12 @@ apply plugin: 'application'
dependencies { dependencies {
compile project(':vtm-gdx') compile project(':vtm-gdx')
compile project(':vtm-themes') compile project(':vtm-themes')
compile files('vtm-natives-desktop.jar') compile files('natives')
compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop" compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
compile "com.badlogicgames.gdx:gdx-backend-jglfw:$gdxVersion" compile "com.badlogicgames.gdx:gdx-backend-jglfw:$gdxVersion"
compile 'org.slf4j:slf4j-simple:1.7.21' compile 'org.slf4j:slf4j-simple:1.7.21'
} }
mainClassName = 'org.oscim.gdx.GdxMapApp'
sourceSets { sourceSets {
main { main {
java.srcDirs = ['src'] java.srcDirs = ['src']
@@ -20,6 +18,16 @@ sourceSets {
} }
} }
task nativesJar(type: Jar) {
classifier = 'natives'
from('natives')
}
artifacts {
archives nativesJar
}
mainClassName = 'org.oscim.gdx.GdxMapApp'
run { ignoreExitValue = true } run { ignoreExitValue = true }
// Automated Gradle project deployment to Sonatype OSSRH // Automated Gradle project deployment to Sonatype OSSRH

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -39,7 +39,7 @@ dependencies {
} }
task copyLibs(type: Copy) { task copyLibs(type: Copy) {
from(zipTree("vtm-natives-ios.jar")) from("natives")
into("${buildDir}/natives") into("${buildDir}/natives")
} }
@@ -65,6 +65,15 @@ tasks.withType(org.gradle.api.tasks.compile.JavaCompile) {
compileTask -> compileTask.dependsOn copyVtmThemesResources compileTask -> compileTask.dependsOn copyVtmThemesResources
} }
task nativesJar(type: Jar) {
classifier = 'natives'
from('natives')
}
artifacts {
archives nativesJar
}
// Automated Gradle project deployment to Sonatype OSSRH // Automated Gradle project deployment to Sonatype OSSRH
if (isReleaseVersion && project.hasProperty("SONATYPE_USERNAME")) { if (isReleaseVersion && project.hasProperty("SONATYPE_USERNAME")) {
afterEvaluate { afterEvaluate {

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -7,8 +7,6 @@ dependencies {
compile project(':vtm-jeo') compile project(':vtm-jeo')
} }
mainClassName = 'org.oscim.gdx.GdxMapApp'
sourceSets { sourceSets {
main { main {
java.srcDirs = ['src'] java.srcDirs = ['src']
@@ -16,4 +14,5 @@ sourceSets {
} }
} }
mainClassName = 'org.oscim.gdx.GdxMapApp'
run { ignoreExitValue = true } run { ignoreExitValue = true }