diff --git a/.gitignore b/.gitignore index 99a9bbaa..ac7009e4 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,5 @@ local.properties # Intellij *.iml .idea/ + +releases \ No newline at end of file diff --git a/README.md b/README.md index efa0235a..39e6eba3 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ ## Install ``` -implementation 'com.filestack:filestack-java:0.9.0' +implementation 'org.filestack:filestack-java:0.9.0' ``` ## Upload diff --git a/build.gradle b/build.gradle index 1cf4b864..0fa39d8d 100644 --- a/build.gradle +++ b/build.gradle @@ -2,6 +2,9 @@ buildscript { ext.kotlin_version = '1.2.71' repositories { mavenCentral() + maven { + url 'https://plugins.gradle.org/m2/' + } } dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" @@ -9,9 +12,12 @@ buildscript { } } + plugins { id 'com.github.kt3k.coveralls' version '2.6.3' - id 'com.jfrog.bintray' version '1.8.4' + id 'java' + id 'maven-publish' + id 'signing' } apply plugin: 'checkstyle' @@ -21,8 +27,10 @@ apply plugin: 'java-library' apply plugin: 'de.fuerstenau.buildconfig' apply plugin: 'maven' apply plugin: 'maven-publish' +apply plugin: 'java' +apply plugin: 'signing' -group = 'com.filestack' +group = 'org.filestack' sourceCompatibility = 1.7 version = file(new File('VERSION')).text.trim() // Get version string from VERSION text file @@ -59,17 +67,6 @@ javadoc { options.optionFiles(new File('./config/javadoc/javadoc.txt')) } -// Publications define artifacts to upload to Bintray -publishing { - publications { - Maven(MavenPublication) { - from components.java - artifact sourcesJar - artifact javadocJar - } - } -} - repositories { jcenter() } @@ -91,39 +88,6 @@ tasks.withType(Test) { // Put unit and integration test reports in separate dire reports.html.destination = file("${reporting.baseDir}/${name}") } -// *************************************** Plugin Config ****************************************** - -bintray { - user = project.hasProperty('bintrayUser') ? project.property('bintrayUser') - : System.getenv('BINTRAY_USER') - key = project.hasProperty('bintrayApiKey') ? project.property('bintrayApiKey') - : System.getenv('BINTRAY_API_KEY') - publications = ['Maven'] - publish = true - pkg { - repo = 'maven' - userOrg = 'filestack' - name = 'filestack-java' - desc = 'Official Java SDK for Filestack.' - - publicDownloadNumbers = true - licenses = ['Apache-2.0'] - - websiteUrl = 'https://filestack.com' - vcsUrl = 'https://github.com/filestack/filestack-java.git' - issueTrackerUrl = 'https://github.com/filestack/filestack-java/issues' - - githubRepo = 'filestack/filestack-java' - githubReleaseNotesFile = 'CHANGELOG.md' - - version { - name = project.version - vcsTag = project.version - released = new Date() - } - } -} - checkstyle { toolVersion '8.1' } @@ -139,4 +103,52 @@ compileTestKotlin { kotlinOptions { jvmTarget = "1.8" } -} \ No newline at end of file +} + +publishing { + publications { + filestackJava(MavenPublication) { + groupId = 'org.filestack' + artifactId = 'filestack-java' + version = file(new File('VERSION')).text.trim() + from components.java + artifact sourcesJar + artifact javadocJar + + pom { + name = 'filestack-java' + description = 'filestack-java' + url = 'https://github.com/filestack/filestack-java' + inceptionYear = '2017' + licenses { + license { + name = 'Apache-2.0' + url = 'https://opensource.org/license/apache-2-0' + } + } + developers { + developer { + id = 'filestack' + name = 'Filestack' + email = 'dev@filestack.com' + } + } + scm { + connection = 'scm:git:git:github.com/filestack/filestack-java.git' + developerConnection = 'scm:git:ssh://github.com/filestack/filestack-java.git' + url = 'https://github.com/filestack/filestack-java' + } + } + } + } + repositories { + maven { + url = layout.projectDirectory.dir('releases') + } + } +} + +signing { + useGpgCmd() + sign publishing.publications.filestackJava +} diff --git a/docs/allclasses-frame.html b/docs/allclasses-frame.html index 2a36f1f5..84c396f9 100644 --- a/docs/allclasses-frame.html +++ b/docs/allclasses-frame.html @@ -11,111 +11,113 @@
public static class FileLink.Builder
-extends java.lang.Object
-FilestackClient
.Modifier and Type | -Method and Description | -
---|---|
FileLink.Builder |
-apiKey(java.lang.String apiKey) |
-
FileLink |
-build()
-Create the
-FileLink using the configured values. |
-
FileLink.Builder |
-handle(java.lang.String handle) |
-
FileLink.Builder |
-security(Security security) |
-
FileLink.Builder |
-service(FsService fsService) |
-
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
public FileLink.Builder apiKey(java.lang.String apiKey)-
public FileLink.Builder handle(java.lang.String handle)-
public FileLink.Builder security(Security security)-
public FileLink.Builder service(FsService fsService)-
diff --git a/docs/allclasses-noframe.html b/docs/allclasses-noframe.html index b6265acd..554e7794 100644 --- a/docs/allclasses-noframe.html +++ b/docs/allclasses-noframe.html @@ -11,111 +11,113 @@
diff --git a/docs/com/filestack/FileLink.Builder.html b/docs/com/filestack/FileLink.Builder.html deleted file mode 100644 index fb8aab20..00000000 --- a/docs/com/filestack/FileLink.Builder.html +++ /dev/null @@ -1,328 +0,0 @@ - - - -
- -
- - - -
-