Android fix

This commit is contained in:
Salomon BRYS 2020-06-29 17:44:27 +02:00
parent 4bdc836556
commit 1787dedb4e
2 changed files with 15 additions and 13 deletions

View File

@ -4,7 +4,7 @@ plugins {
`maven-publish` `maven-publish`
} }
group = "fr.acinq.secp256k1" group = "fr.acinq.secp256k1"
version = "0.2.0-1.4-M2" version = "0.2.1-1.4-M2"
repositories { repositories {
jcenter() jcenter()
@ -51,6 +51,7 @@ kotlin {
} }
android { android {
publishLibraryVariants("release", "debug")
compilations.all { compilations.all {
kotlinOptions.jvmTarget = "1.8" kotlinOptions.jvmTarget = "1.8"
} }
@ -129,6 +130,11 @@ android {
} }
} }
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
externalNativeBuild { externalNativeBuild {
cmake { cmake {
setPath("src/androidMain/CMakeLists.txt") setPath("src/androidMain/CMakeLists.txt")
@ -137,6 +143,12 @@ android {
ndkVersion = "21.3.6528147" ndkVersion = "21.3.6528147"
sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
afterEvaluate {
tasks.withType<com.android.build.gradle.tasks.factory.AndroidUnitTest>().all {
enabled = false
}
}
} }
val buildSecp256k1 by tasks.creating { group = "build" } val buildSecp256k1 by tasks.creating { group = "build" }
@ -231,12 +243,6 @@ tasks["clean"].doLast {
delete(projectDir.resolve("native/build")) delete(projectDir.resolve("native/build"))
} }
afterEvaluate {
tasks.withType<com.android.build.gradle.tasks.factory.AndroidUnitTest>().all {
enabled = false
}
}
publishing { publishing {
val snapshotName: String? by project val snapshotName: String? by project
val snapshotNumber: String? by project val snapshotNumber: String? by project

View File

@ -1,13 +1,9 @@
pluginManagement { pluginManagement {
repositories { repositories {
mavenCentral()
google() google()
gradlePluginPortal()
maven {
url = uri("https://dl.bintray.com/kotlin/kotlin-eap")
}
maven("https://dl.bintray.com/kotlin/kotlin-eap") maven("https://dl.bintray.com/kotlin/kotlin-eap")
maven("https://plugins.gradle.org/m2/") gradlePluginPortal()
jcenter()
} }
resolutionStrategy { resolutionStrategy {