From c53f8db73d53eb8fc1c5d426568d35e9b99c2fa2 Mon Sep 17 00:00:00 2001 From: Jesse Wilson Date: Sun, 17 Mar 2019 09:13:01 -0400 Subject: [PATCH] Configure gradle artifact uploads --- .buildscript/deploy_snapshot.sh | 3 +-- .buildscript/settings.xml | 9 --------- .travis.yml | 4 ++-- gradle.properties | 2 +- mockwebserver/build.gradle | 2 ++ mockwebserver/gradle.properties | 3 +++ okcurl/build.gradle | 2 ++ okcurl/gradle.properties | 3 +++ okhttp-dnsoverhttps/build.gradle | 2 ++ okhttp-dnsoverhttps/gradle.properties | 3 +++ okhttp-logging-interceptor/build.gradle | 2 ++ okhttp-logging-interceptor/gradle.properties | 3 +++ okhttp-sse/build.gradle | 2 ++ okhttp-sse/gradle.properties | 3 +++ okhttp-tls/build.gradle | 2 ++ okhttp-tls/gradle.properties | 3 +++ okhttp-urlconnection/build.gradle | 2 ++ okhttp-urlconnection/gradle.properties | 3 +++ okhttp/build.gradle | 2 ++ okhttp/gradle.properties | 3 +++ 20 files changed, 44 insertions(+), 14 deletions(-) delete mode 100644 .buildscript/settings.xml create mode 100644 mockwebserver/gradle.properties create mode 100644 okcurl/gradle.properties create mode 100644 okhttp-dnsoverhttps/gradle.properties create mode 100644 okhttp-logging-interceptor/gradle.properties create mode 100644 okhttp-sse/gradle.properties create mode 100644 okhttp-tls/gradle.properties create mode 100644 okhttp-urlconnection/gradle.properties create mode 100644 okhttp/gradle.properties diff --git a/.buildscript/deploy_snapshot.sh b/.buildscript/deploy_snapshot.sh index a0b55d6d0..7dfe3f41b 100755 --- a/.buildscript/deploy_snapshot.sh +++ b/.buildscript/deploy_snapshot.sh @@ -21,7 +21,6 @@ elif [ "$TRAVIS_BRANCH" != "$BRANCH" ]; then echo "Skipping snapshot deployment: wrong branch. Expected '$BRANCH' but was '$TRAVIS_BRANCH'." else echo "Deploying snapshot..." - echo "TODO: fix snapshot deployment for gradle..." - # ./mvnw clean source:jar javadoc:jar deploy --settings=".buildscript/settings.xml" -DskipTests -B + ./gradlew clean uploadArchives echo "Snapshot deployed!" fi diff --git a/.buildscript/settings.xml b/.buildscript/settings.xml deleted file mode 100644 index 91f444b22..000000000 --- a/.buildscript/settings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - sonatype-nexus-snapshots - ${env.CI_DEPLOY_USERNAME} - ${env.CI_DEPLOY_PASSWORD} - - - diff --git a/.travis.yml b/.travis.yml index dd07c678d..1b1cadb39 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,8 +13,8 @@ after_success: env: global: - - secure: "S0BTJVrF4fUCwhTdmoQY6LYr5r1wgXZ/p8lc5bIgUUsc1Ckalwt7s/GDwPuLJ4702sI5t56Eye2iEIMUjeFJKqebZRsX1C5oYsYFxGi3BGlepstYpmj0gLXuSWqCLniS9zmHXCxLhLkC6KxPVjhDlbq76XQx0o3K1J8oEIj/PCE=" - - secure: "awV7yLXURjlPbTOladsNDZk74KYCNXoiZpAP0gQFfK4Sc0fc7+kg8z/yhdWXeTxjsIZ6m0dVDHTqnH8ytnydwXpBam8JdQJ+EAWA6R3Svq1BR1bzl/PcZUoz+Xn8lMXdU3yA1p4qtQlUhMxwsE3MOVe24HSDJPAu4XeWFj1j3qo=" + - secure: "fELrorBJHDz+Xk9iSVMnamu0qC0+pYnFvjnEIcGnmKMMxLI/CIMACghIfSkqZhKAcU3hvxgWzyY8JBMnf5tykUjjOwmubAjZ9qIvwujtrUoUitUkpvVaPtqF0d1Yx0Xq4qt3NB9cOugPR/cPGnoEvSKfND3g+o5ta7KzdjwMBCY=" + - secure: "WMkcWrsvzJNf48w7DJwipUNbhAoggCkC+NM31esq9/GDceGtVWj4hssQETynG4+ckxr0wGqUxsTRTz0uGhX6Fi58haG8yKp+g/HVClqI5EYjI44ptPcwlqlbYjuGbk65k1OGGZLctA6fQA3uT0zee05/yBjJx/jOqrN+PD1tW38=" branches: except: diff --git a/gradle.properties b/gradle.properties index ec2302aca..7c006bc8b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ org.gradle.jvmargs='-Dfile.encoding=UTF-8' GROUP=com.squareup.okhttp3 -VERSION_NAME=3.15.0-SNAPSHOT +VERSION_NAME=4.0.0-SNAPSHOT POM_URL=https://github.com/square/okhttp POM_SCM_URL=https://github.com/square/okhttp diff --git a/mockwebserver/build.gradle b/mockwebserver/build.gradle index 1150ac145..4ec3c58b4 100644 --- a/mockwebserver/build.gradle +++ b/mockwebserver/build.gradle @@ -1,3 +1,5 @@ +apply plugin: 'com.vanniktech.maven.publish' + jar { manifest { attributes('Automatic-Module-Name': 'okhttp3.mockwebserver') diff --git a/mockwebserver/gradle.properties b/mockwebserver/gradle.properties new file mode 100644 index 000000000..640fcdf3d --- /dev/null +++ b/mockwebserver/gradle.properties @@ -0,0 +1,3 @@ +POM_ARTIFACT_ID=mockwebserver +POM_NAME=mockwebserver +POM_PACKAGING=jar diff --git a/okcurl/build.gradle b/okcurl/build.gradle index c96f6ecec..955ab5829 100644 --- a/okcurl/build.gradle +++ b/okcurl/build.gradle @@ -1,3 +1,5 @@ +apply plugin: 'com.vanniktech.maven.publish' + jar { manifest { attributes 'Automatic-Module-Name': 'okhttp3.curl' diff --git a/okcurl/gradle.properties b/okcurl/gradle.properties new file mode 100644 index 000000000..ae701b79b --- /dev/null +++ b/okcurl/gradle.properties @@ -0,0 +1,3 @@ +POM_ARTIFACT_ID=okcurl +POM_NAME=okcurl +POM_PACKAGING=jar diff --git a/okhttp-dnsoverhttps/build.gradle b/okhttp-dnsoverhttps/build.gradle index 61d68a256..1a9f10409 100644 --- a/okhttp-dnsoverhttps/build.gradle +++ b/okhttp-dnsoverhttps/build.gradle @@ -1,3 +1,5 @@ +apply plugin: 'com.vanniktech.maven.publish' + jar { manifest { attributes('Automatic-Module-Name': 'okhttp3.dnsoverhttps') diff --git a/okhttp-dnsoverhttps/gradle.properties b/okhttp-dnsoverhttps/gradle.properties new file mode 100644 index 000000000..bd908aaa2 --- /dev/null +++ b/okhttp-dnsoverhttps/gradle.properties @@ -0,0 +1,3 @@ +POM_ARTIFACT_ID=okhttp-dnsoverhttps +POM_NAME=okhttp-dnsoverhttps +POM_PACKAGING=jar diff --git a/okhttp-logging-interceptor/build.gradle b/okhttp-logging-interceptor/build.gradle index f4fb95132..7b4a1a38f 100644 --- a/okhttp-logging-interceptor/build.gradle +++ b/okhttp-logging-interceptor/build.gradle @@ -1,3 +1,5 @@ +apply plugin: 'com.vanniktech.maven.publish' + jar { manifest { attributes('Automatic-Module-Name': 'okhttp3.logging') diff --git a/okhttp-logging-interceptor/gradle.properties b/okhttp-logging-interceptor/gradle.properties new file mode 100644 index 000000000..8029f3997 --- /dev/null +++ b/okhttp-logging-interceptor/gradle.properties @@ -0,0 +1,3 @@ +POM_ARTIFACT_ID=okhttp-logging-interceptor +POM_NAME=okhttp-logging-interceptor +POM_PACKAGING=jar diff --git a/okhttp-sse/build.gradle b/okhttp-sse/build.gradle index 5d8c5c6c4..9cf45a998 100644 --- a/okhttp-sse/build.gradle +++ b/okhttp-sse/build.gradle @@ -1,3 +1,5 @@ +apply plugin: 'com.vanniktech.maven.publish' + jar { manifest { attributes('Automatic-Module-Name': 'okhttp3.sse') diff --git a/okhttp-sse/gradle.properties b/okhttp-sse/gradle.properties new file mode 100644 index 000000000..497287dfc --- /dev/null +++ b/okhttp-sse/gradle.properties @@ -0,0 +1,3 @@ +POM_ARTIFACT_ID=okhttp-sse +POM_NAME=okhttp-sse +POM_PACKAGING=jar diff --git a/okhttp-tls/build.gradle b/okhttp-tls/build.gradle index cf3c4fdfe..492cbd4a9 100644 --- a/okhttp-tls/build.gradle +++ b/okhttp-tls/build.gradle @@ -1,3 +1,5 @@ +apply plugin: 'com.vanniktech.maven.publish' + jar { manifest { attributes('Automatic-Module-Name': 'okhttp3.tls') diff --git a/okhttp-tls/gradle.properties b/okhttp-tls/gradle.properties new file mode 100644 index 000000000..7ed0a3b63 --- /dev/null +++ b/okhttp-tls/gradle.properties @@ -0,0 +1,3 @@ +POM_ARTIFACT_ID=okhttp-tls +POM_NAME=okhttp-tls +POM_PACKAGING=jar diff --git a/okhttp-urlconnection/build.gradle b/okhttp-urlconnection/build.gradle index 8183e8886..19eb6464c 100644 --- a/okhttp-urlconnection/build.gradle +++ b/okhttp-urlconnection/build.gradle @@ -1,3 +1,5 @@ +apply plugin: 'com.vanniktech.maven.publish' + jar { manifest { attributes('Automatic-Module-Name': 'okhttp3.urlconnection') diff --git a/okhttp-urlconnection/gradle.properties b/okhttp-urlconnection/gradle.properties new file mode 100644 index 000000000..33c8a52a3 --- /dev/null +++ b/okhttp-urlconnection/gradle.properties @@ -0,0 +1,3 @@ +POM_ARTIFACT_ID=okhttp-urlconnection +POM_NAME=okhttp-urlconnection +POM_PACKAGING=jar diff --git a/okhttp/build.gradle b/okhttp/build.gradle index ef28c857f..f2712de30 100644 --- a/okhttp/build.gradle +++ b/okhttp/build.gradle @@ -1,3 +1,5 @@ +apply plugin: 'com.vanniktech.maven.publish' + jar { manifest { attributes('Automatic-Module-Name': 'okhttp3') diff --git a/okhttp/gradle.properties b/okhttp/gradle.properties new file mode 100644 index 000000000..f847919b0 --- /dev/null +++ b/okhttp/gradle.properties @@ -0,0 +1,3 @@ +POM_ARTIFACT_ID=okhttp +POM_NAME=okhttp +POM_PACKAGING=jar