diff options
| -rw-r--r-- | build.gradle | 4 | ||||
| -rw-r--r-- | tunnel/build.gradle | 1 | ||||
| -rw-r--r-- | tunnel/publish.gradle | 92 |
3 files changed, 45 insertions, 52 deletions
diff --git a/build.gradle b/build.gradle index b4440212..f1d56c3e 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,6 @@ buildscript { agpVersion = '4.1.0' annotationsVersion = '1.1.0' appcompatVersion = '1.2.0' - bintrayPluginVersion = '1.8.5' biometricVersion = '1.1.0-beta01' collectionVersion = '1.1.0' constraintLayoutVersion = '2.0.2' @@ -19,7 +18,6 @@ buildscript { kotlinVersion = '1.4.10' lifecycleRuntimeKtxVersion = '2.3.0-alpha07' materialComponentsVersion = '1.3.0-alpha03' - mavenPluginVersion = '2.1' preferenceVersion = '1.1.1' zxingEmbeddedVersion = '3.6.0' @@ -28,8 +26,6 @@ buildscript { dependencies { classpath "com.android.tools.build:gradle:$agpVersion" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" - classpath "com.github.dcendents:android-maven-gradle-plugin:$mavenPluginVersion" - classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:$bintrayPluginVersion" } repositories { google() diff --git a/tunnel/build.gradle b/tunnel/build.gradle index 11007371..28d02804 100644 --- a/tunnel/build.gradle +++ b/tunnel/build.gradle @@ -46,6 +46,7 @@ android { } lintOptions { disable('LongLogTag') + disable('NewApi') // Desugaring! } } diff --git a/tunnel/publish.gradle b/tunnel/publish.gradle index 63e7d0cf..7124da64 100644 --- a/tunnel/publish.gradle +++ b/tunnel/publish.gradle @@ -1,53 +1,53 @@ -apply plugin: 'com.github.dcendents.android-maven' -apply plugin: 'com.jfrog.bintray' +apply plugin: 'maven-publish' -install { - repositories.mavenInstaller { - pom.project { - name 'WireGuard Tunnel Library' - description 'Embeddable tunnel library for WireGuard for Android' - url 'https://www.wireguard.com/' +afterEvaluate { + publishing { + publications { + release(MavenPublication) { + groupId = groupName + artifactId = 'tunnel' + version wireguardVersionName - packaging 'aar' - groupId groupName - artifactId 'tunnel' - version wireguardVersionName + artifact sourcesJar + artifact javadocJar - licenses { - license { - name 'The Apache Software License, Version 2.0' - url 'http://www.apache.org/licenses/LICENSE-2.0.txt' - distribution 'repo' + from components.getByName("release") + + pom { + name = 'WireGuard Tunnel Library' + description = 'Embeddable tunnel library for WireGuard for Android' + url = 'https://www.wireguard.com/' + + licenses { + license { + name = 'The Apache Software License, Version 2.0' + url = 'http://www.apache.org/licenses/LICENSE-2.0.txt' + distribution = 'repo' + } + } + scm { + connection = 'scm:git:https://git.zx2c4.com/wireguard-android' + developerConnection = 'scm:git:https://git.zx2c4.com/wireguard-android' + url = 'https://git.zx2c4.com/wireguard-android' + } + developers { + organization { + name = 'WireGuard' + url = 'https://www.wireguard.com/' + } + } } } - scm { - connection 'scm:git:https://git.zx2c4.com/wireguard-android' - url 'https://git.zx2c4.com/wireguard-android' - } - organization { - name 'WireGuard' - url 'https://www.wireguard.com/' - } } - } -} - -bintray { - user = hasProperty('BINTRAY_USER') ? getProperty('BINTRAY_USER') : System.getenv('BINTRAY_USER') - key = hasProperty('BINTRAY_KEY') ? getProperty('BINTRAY_KEY') : System.getenv('BINTRAY_KEY') - - configurations = [ 'archives' ] - - pkg { - repo = 'wireguard-android' - name = 'wireguard-android' - userOrg = 'wireguard' - licenses = [ 'Apache-2.0' ] - vcsUrl = 'https://git.zx2c4.com/wireguard-android' - publish = true - - version { - name = wireguardVersionName + repositories { + maven { + name = "bintray" + url = uri("https://api.bintray.com/maven/wireguard/wireguard-android/wireguard-android/;publish=1;override=0") + credentials { + username = hasProperty('BINTRAY_USER') ? getProperty('BINTRAY_USER') : System.getenv('BINTRAY_USER') + password = hasProperty('BINTRAY_KEY') ? getProperty('BINTRAY_KEY') : System.getenv('BINTRAY_KEY') + } + } } } } @@ -68,9 +68,5 @@ android.libraryVariants.all { variant -> archiveClassifier = 'sources' from android.sourceSets.main.java.srcDirs } - artifacts { - archives sourcesJar - archives javadocJar - } } } |