diff --git a/README.md b/README.md index 1c03e75b..6c7c4692 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ Scarlet === [![CircleCI](https://circleci.com/gh/Tinder/Scarlet.svg?style=svg)](https://circleci.com/gh/Tinder/Scarlet) -[![Release](https://jitpack.io/v/tinder/scarlet.svg)](https://jitpack.io/#tinder/scarlet) A Retrofit inspired WebSocket client for Kotlin, Java, and Android. @@ -76,29 +75,22 @@ TODO Download -------- -While we are working on Bintray support, Scarlet is available via [JitPack][jitpack]. +Scarlet is available via Maven Central. + +Snapshots of the development version are available in [Sonatype's `snapshots` repository][snap]. ##### Maven: ```xml - - jitpack.io - https://jitpack.io - com.github.tinder.scarlet scarlet - 0.1.7 + 0.1.8 ``` ##### Gradle: ```groovy -repositories { - // ... - maven { url "https://jitpack.io" } -} - -implementation 'com.github.tinder.scarlet:scarlet:$0.1.7' +implementation 'com.tinder.scarlet:scarlet:0.1.8' ``` ### Plug-in Roadmap @@ -162,4 +154,4 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [slides]: https://speakerdeck.com/zhxnlai/taming-websocket-with-scarlet [kotliners]: https://www.conferenceforkotliners.com/ [state-machine]: https://github.com/Tinder/StateMachine - [jitpack]: https://jitpack.io/#tinder/scarlet + [snap]: https://oss.sonatype.org/content/repositories/snapshots/ diff --git a/build.gradle b/build.gradle index 5be2d7dd..1a84cf51 100644 --- a/build.gradle +++ b/build.gradle @@ -4,16 +4,14 @@ buildscript { ext.kotlin_version = '1.3.0' ext.dokka_version = '0.9.16' repositories { + mavenCentral() google() jcenter() } dependencies { + classpath 'com.vanniktech:gradle-maven-publish-plugin:0.8.0' classpath 'com.android.tools.build:gradle:3.2.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.5.4" - classpath "org.jetbrains.dokka:dokka-gradle-plugin:${dokka_version}" - classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:${dokka_version}" - classpath 'org.kordamp.gradle:stats-gradle-plugin:0.2.2' } } @@ -26,14 +24,13 @@ ktlint { } subprojects { - apply plugin: 'org.kordamp.gradle.stats' - apply plugin: "com.jfrog.artifactory" - // group = 'com.tinder.scarlet' TODO use Bintray - group = 'com.github.tinder' + group = GROUP + version = VERSION_NAME repositories { - maven { url "https://jitpack.io" } + mavenCentral() google() + maven { url "https://jitpack.io" } jcenter() } } diff --git a/gradle.properties b/gradle.properties index 237b86fd..88766384 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,16 @@ android.enableJetifier=true android.useAndroidX=true -version=0.1.7 + +GROUP=com.tinder.scarlet +VERSION_NAME=0.1.8 + +POM_DESCRIPTION=A Retrofit inspired WebSocket client for Kotlin, Java, and Android. +POM_URL=https://github.com/Tinder/Scarlet +POM_SCM_URL=https://github.com/Tinder/Scarlet +POM_SCM_CONNECTION=scm:git:git://github.com/Tinder/Scarlet.git +POM_SCM_DEV_CONNECTION=scm:git:ssh://git@github.com/Tinder/Scarlet.git +POM_LICENCE_NAME=BSD 3-Clause "New" or "Revised" License +POM_LICENCE_URL=https://opensource.org/licenses/BSD-3-Clause +POM_LICENCE_DIST=repo +POM_DEVELOPER_ID=Tinder +POM_DEVELOPER_NAME=Tinder Open Source \ No newline at end of file diff --git a/scarlet-core-internal/build.gradle b/scarlet-core-internal/build.gradle index 98ab8041..a6a028f2 100644 --- a/scarlet-core-internal/build.gradle +++ b/scarlet-core-internal/build.gradle @@ -1,6 +1,6 @@ +apply plugin: 'com.vanniktech.maven.publish' apply plugin: 'kotlin' apply plugin: 'java-library' -apply plugin: 'maven-publish' dependencies { api project(':scarlet-core') @@ -13,42 +13,4 @@ dependencies { testImplementation rootProject.ext.mockito testImplementation rootProject.ext.kotlinReflect testImplementation rootProject.ext.assertJ -} - -task sourcesJar(type: Jar, dependsOn: classes) { - classifier = 'sources' - from sourceSets.main.allSource -} - -artifacts { - archives sourcesJar -} - -publishing { - publications { - mavenJava(MavenPublication) { - groupId 'com.tinder' - version version - artifactId project.getName() - artifact sourcesJar - from components.java - } - } -} - -artifactory { - contextUrl = 'https://tinder.jfrog.io/tinder' - publish { - repository { - repoKey = 'libs-release-local' - username = System.getenv("ARTIFACTORY_USER") - password = System.getenv("ARTIFACTORY_PASSWORD") - maven = true - } - defaults { - publications('mavenJava') - publishArtifacts = true - publishPom = true - } - } -} +} \ No newline at end of file diff --git a/scarlet-core-internal/gradle.properties b/scarlet-core-internal/gradle.properties new file mode 100644 index 00000000..457dbc9c --- /dev/null +++ b/scarlet-core-internal/gradle.properties @@ -0,0 +1,3 @@ +POM_ARTIFACT_ID=scarlet-core-internal +POM_NAME=Scarlet Core Internal +POM_PACKAGING=jar \ No newline at end of file diff --git a/scarlet-core/build.gradle b/scarlet-core/build.gradle index 3de8323a..b1722897 100644 --- a/scarlet-core/build.gradle +++ b/scarlet-core/build.gradle @@ -1,7 +1,6 @@ +apply plugin: 'com.vanniktech.maven.publish' apply plugin: 'kotlin' apply plugin: 'java-library' -apply plugin: 'org.jetbrains.dokka' -apply plugin: 'maven-publish' dependencies { api rootProject.ext.reactiveStreams @@ -10,57 +9,3 @@ dependencies { testImplementation rootProject.ext.junit testImplementation rootProject.ext.assertJ } - -dokka { - outputFormat = 'javadoc' - outputDirectory = "$buildDir/javadoc" -} - -task sourcesJar(type: Jar, dependsOn: classes) { - classifier = 'sources' - from sourceSets.main.allSource -} - -task dokkaJavadoc(type: org.jetbrains.dokka.gradle.DokkaTask) { - outputFormat = 'javadoc' - outputDirectory = javadoc.destinationDir -} - -task javadocJar(type: Jar, dependsOn: dokkaJavadoc) { - classifier = 'javadoc' - from javadoc.destinationDir -} - -artifacts { - archives sourcesJar, javadocJar -} - -publishing { - publications { - mavenJava(MavenPublication) { - groupId 'com.tinder' - version version - artifactId project.getName() - artifact sourcesJar - artifact javadocJar - from components.java - } - } -} - -artifactory { - contextUrl = 'https://tinder.jfrog.io/tinder' - publish { - repository { - repoKey = 'libs-release-local' - username = System.getenv("ARTIFACTORY_USER") - password = System.getenv("ARTIFACTORY_PASSWORD") - maven = true - } - defaults { - publications('mavenJava') - publishArtifacts = true - publishPom = true - } - } -} diff --git a/scarlet-core/gradle.properties b/scarlet-core/gradle.properties new file mode 100644 index 00000000..d1989127 --- /dev/null +++ b/scarlet-core/gradle.properties @@ -0,0 +1,3 @@ +POM_ARTIFACT_ID=scarlet-core +POM_NAME=Scarlet(Core) +POM_PACKAGING=jar \ No newline at end of file diff --git a/scarlet-lifecycle-android/build.gradle b/scarlet-lifecycle-android/build.gradle index 916370de..58934454 100755 --- a/scarlet-lifecycle-android/build.gradle +++ b/scarlet-lifecycle-android/build.gradle @@ -1,7 +1,5 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -apply plugin: 'org.jetbrains.dokka-android' -apply plugin: 'maven-publish' android { compileSdkVersion rootProject.ext.compileSdkVersion @@ -33,90 +31,4 @@ dependencies { testImplementation rootProject.ext.junit } -dokka { - outputFormat = 'javadoc' - outputDirectory = "$buildDir/javadoc" -} - -task javadoc(type: Javadoc) { - failOnError false - source = android.sourceSets.main.java.sourceFiles - classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) - classpath += configurations.compile -} - -task dokkaJavadoc(type: org.jetbrains.dokka.gradle.DokkaTask) { - outputFormat = 'javadoc' - outputDirectory = javadoc.destinationDir -} - -task javadocJar(type: Jar, dependsOn: dokkaJavadoc) { - classifier = 'javadoc' - from javadoc.destinationDir -} - -task sourcesJar(type: Jar) { - from android.sourceSets.main.java.srcDirs - classifier "sources" -} - -publishing { - publications { - aar(MavenPublication) { - groupId 'com.tinder' - version version - artifactId project.getName() - - artifact(sourcesJar) - artifact(javadocJar) - artifact("$buildDir/outputs/aar/${project.getName()}-release.aar") - - pom.withXml { - def dependenciesNode = asNode().appendNode('dependencies') - - // List all compile dependencies and write to POM - configurations.implementation.getAllDependencies().each { Dependency dep -> - if (dep.group == null || dep.version == null || dep.name == null || dep.name == "unspecified") - return // ignore invalid dependencies - - def dependencyNode = dependenciesNode.appendNode('dependency') - dependencyNode.appendNode('groupId', dep.group) - dependencyNode.appendNode('artifactId', dep.name) - dependencyNode.appendNode('version', dep.version) - - if (!dep.transitive) { - // If this dependency is transitive, we should force exclude all its dependencies them from the POM - def exclusionNode = dependencyNode.appendNode('exclusions').appendNode('exclusion') - exclusionNode.appendNode('groupId', '*') - exclusionNode.appendNode('artifactId', '*') - } else if (!dep.properties.excludeRules.empty) { - // Otherwise add specified exclude rules - def exclusionsNode = dependencyNode.appendNode('exclusions') - dep.properties.excludeRules.each { ExcludeRule rule -> - def exclusionNode = exclusionsNode.appendNode('exclusion') - exclusionNode.appendNode('groupId', rule.group ?: '*') - exclusionNode.appendNode('artifactId', rule.module ?: '*') - } - } - } - } - } - } -} - -artifactory { - contextUrl = 'https://tinder.jfrog.io/tinder' - publish { - repository { - repoKey = 'libs-release-local' - username = System.getenv("ARTIFACTORY_USER") - password = System.getenv("ARTIFACTORY_PASSWORD") - maven = true - } - defaults { - publications('aar') - publishArtifacts = true - publishPom = true - } - } -} +apply plugin: 'com.vanniktech.maven.publish' \ No newline at end of file diff --git a/scarlet-lifecycle-android/gradle.properties b/scarlet-lifecycle-android/gradle.properties new file mode 100644 index 00000000..0ca17483 --- /dev/null +++ b/scarlet-lifecycle-android/gradle.properties @@ -0,0 +1,3 @@ +POM_ARTIFACT_ID=lifecycle-android +POM_NAME=Lifecyle: Android +POM_PACKAGING=aar \ No newline at end of file diff --git a/scarlet-message-adapter-builtin/build.gradle b/scarlet-message-adapter-builtin/build.gradle index 0527cd6c..06049c60 100644 --- a/scarlet-message-adapter-builtin/build.gradle +++ b/scarlet-message-adapter-builtin/build.gradle @@ -1,6 +1,6 @@ +apply plugin: 'com.vanniktech.maven.publish' apply plugin: 'kotlin' apply plugin: 'java-library' -apply plugin: 'maven-publish' dependencies { implementation project(':scarlet-core') @@ -12,41 +12,3 @@ dependencies { testImplementation rootProject.ext.kotlinReflect testImplementation rootProject.ext.assertJ } - -task sourcesJar(type: Jar, dependsOn: classes) { - classifier = 'sources' - from sourceSets.main.allSource -} - -artifacts { - archives sourcesJar -} - -publishing { - publications { - mavenJava(MavenPublication) { - groupId 'com.tinder' - version version - artifactId project.getName() - artifact sourcesJar - from components.java - } - } -} - -artifactory { - contextUrl = 'https://tinder.jfrog.io/tinder' - publish { - repository { - repoKey = 'libs-release-local' - username = System.getenv("ARTIFACTORY_USER") - password = System.getenv("ARTIFACTORY_PASSWORD") - maven = true - } - defaults { - publications('mavenJava') - publishArtifacts = true - publishPom = true - } - } -} diff --git a/scarlet-message-adapter-builtin/gradle.properties b/scarlet-message-adapter-builtin/gradle.properties new file mode 100644 index 00000000..3a2d241b --- /dev/null +++ b/scarlet-message-adapter-builtin/gradle.properties @@ -0,0 +1,3 @@ +POM_ARTIFACT_ID=message-adapter-built-in +POM_NAME=Message Adapter: Built-in +POM_PACKAGING=jar \ No newline at end of file diff --git a/scarlet-message-adapter-gson/build.gradle b/scarlet-message-adapter-gson/build.gradle index b174d6b4..d77632d3 100755 --- a/scarlet-message-adapter-gson/build.gradle +++ b/scarlet-message-adapter-gson/build.gradle @@ -1,7 +1,6 @@ +apply plugin: 'com.vanniktech.maven.publish' apply plugin: 'kotlin' apply plugin: 'java-library' -apply plugin: 'org.jetbrains.dokka' -apply plugin: 'maven-publish' dependencies { api rootProject.ext.gson @@ -17,58 +16,4 @@ dependencies { testImplementation rootProject.ext.mockito testImplementation rootProject.ext.kotlinReflect testImplementation rootProject.ext.assertJ -} - -dokka { - outputFormat = 'javadoc' - outputDirectory = "$buildDir/javadoc" -} - -task sourcesJar(type: Jar, dependsOn: classes) { - classifier = 'sources' - from sourceSets.main.allSource -} - -task dokkaJavadoc(type: org.jetbrains.dokka.gradle.DokkaTask) { - outputFormat = 'javadoc' - outputDirectory = javadoc.destinationDir -} - -task javadocJar(type: Jar, dependsOn: dokkaJavadoc) { - classifier = 'javadoc' - from javadoc.destinationDir -} - -artifacts { - archives sourcesJar, javadocJar -} - -publishing { - publications { - mavenJava(MavenPublication) { - groupId 'com.tinder' - version version - artifactId project.getName() - artifact sourcesJar - artifact javadocJar - from components.java - } - } -} - -artifactory { - contextUrl = 'https://tinder.jfrog.io/tinder' - publish { - repository { - repoKey = 'libs-release-local' - username = System.getenv("ARTIFACTORY_USER") - password = System.getenv("ARTIFACTORY_PASSWORD") - maven = true - } - defaults { - publications('mavenJava') - publishArtifacts = true - publishPom = true - } - } -} +} \ No newline at end of file diff --git a/scarlet-message-adapter-gson/gradle.properties b/scarlet-message-adapter-gson/gradle.properties new file mode 100644 index 00000000..f676975c --- /dev/null +++ b/scarlet-message-adapter-gson/gradle.properties @@ -0,0 +1,3 @@ +POM_ARTIFACT_ID=message-adapter-gson +POM_NAME=Message Adapter: Gson +POM_PACKAGING=jar \ No newline at end of file diff --git a/scarlet-message-adapter-jackson/build.gradle b/scarlet-message-adapter-jackson/build.gradle index 6a2027d0..37de01b5 100755 --- a/scarlet-message-adapter-jackson/build.gradle +++ b/scarlet-message-adapter-jackson/build.gradle @@ -1,7 +1,6 @@ +apply plugin: 'com.vanniktech.maven.publish' apply plugin: 'kotlin' apply plugin: 'java-library' -apply plugin: 'org.jetbrains.dokka' -apply plugin: 'maven-publish' dependencies { api rootProject.ext.jacksonDatabind @@ -18,60 +17,4 @@ dependencies { testImplementation rootProject.ext.kotlinReflect testImplementation rootProject.ext.assertJ testImplementation rootProject.ext.jacksonModuleKotlin -} - -task sourcesJar(type: Jar, dependsOn: classes) { - classifier = 'sources' - from sourceSets.main.allSource -} - -task dokkaJavadoc(type: org.jetbrains.dokka.gradle.DokkaTask) { - outputFormat = 'javadoc' - outputDirectory = javadoc.destinationDir - -// impliedPlatforms = ['JVM'] -// jdkVersion = 7 - - externalDocumentationLink { - url = new URL("https://docs.oracle.com/javase/7/docs/api/") - } -} - -task javadocJar(type: Jar, dependsOn: dokkaJavadoc) { - classifier = 'javadoc' - from javadoc.destinationDir -} - -artifacts { - archives sourcesJar, javadocJar -} - -publishing { - publications { - mavenJava(MavenPublication) { - groupId 'com.tinder' - version version - artifactId project.getName() - artifact sourcesJar - artifact javadocJar - from components.java - } - } -} - -artifactory { - contextUrl = 'https://tinder.jfrog.io/tinder' - publish { - repository { - repoKey = 'libs-release-local' - username = System.getenv("ARTIFACTORY_USER") - password = System.getenv("ARTIFACTORY_PASSWORD") - maven = true - } - defaults { - publications('mavenJava') - publishArtifacts = true - publishPom = true - } - } -} +} \ No newline at end of file diff --git a/scarlet-message-adapter-jackson/gradle.properties b/scarlet-message-adapter-jackson/gradle.properties new file mode 100644 index 00000000..a17dc0b7 --- /dev/null +++ b/scarlet-message-adapter-jackson/gradle.properties @@ -0,0 +1,3 @@ +POM_ARTIFACT_ID=message-adapter-jackson +POM_NAME=Message Adapter: Jackson +POM_PACKAGING=jar \ No newline at end of file diff --git a/scarlet-message-adapter-moshi/build.gradle b/scarlet-message-adapter-moshi/build.gradle index f7836198..a4e9c0eb 100755 --- a/scarlet-message-adapter-moshi/build.gradle +++ b/scarlet-message-adapter-moshi/build.gradle @@ -1,7 +1,6 @@ +apply plugin: 'com.vanniktech.maven.publish' apply plugin: 'kotlin' apply plugin: 'java-library' -apply plugin: 'org.jetbrains.dokka' -apply plugin: 'maven-publish' dependencies { api rootProject.ext.moshi @@ -17,63 +16,4 @@ dependencies { testImplementation rootProject.ext.mockito testImplementation rootProject.ext.kotlinReflect testImplementation rootProject.ext.assertJ -} - -task sourcesJar(type: Jar, dependsOn: classes) { - classifier = 'sources' - from sourceSets.main.allSource -} - -task dokkaJavadoc(type: org.jetbrains.dokka.gradle.DokkaTask) { - outputFormat = 'javadoc' - outputDirectory = javadoc.destinationDir - -// impliedPlatforms = ['JVM'] -// jdkVersion = 7 - - externalDocumentationLink { - url = new URL("http://square.github.io/moshi/1.x/moshi/") - } - externalDocumentationLink { - url = new URL("https://docs.oracle.com/javase/7/docs/api/") - } -} - -task javadocJar(type: Jar, dependsOn: dokkaJavadoc) { - classifier = 'javadoc' - from javadoc.destinationDir -} - -artifacts { - archives sourcesJar, javadocJar -} - -publishing { - publications { - mavenJava(MavenPublication) { - groupId 'com.tinder' - version version - artifactId project.getName() - artifact sourcesJar - artifact javadocJar - from components.java - } - } -} - -artifactory { - contextUrl = 'https://tinder.jfrog.io/tinder' - publish { - repository { - repoKey = 'libs-release-local' - username = System.getenv("ARTIFACTORY_USER") - password = System.getenv("ARTIFACTORY_PASSWORD") - maven = true - } - defaults { - publications('mavenJava') - publishArtifacts = true - publishPom = true - } - } -} +} \ No newline at end of file diff --git a/scarlet-message-adapter-moshi/gradle.properties b/scarlet-message-adapter-moshi/gradle.properties new file mode 100644 index 00000000..6a914fae --- /dev/null +++ b/scarlet-message-adapter-moshi/gradle.properties @@ -0,0 +1,3 @@ +POM_ARTIFACT_ID=message-adapter-moshi +POM_NAME=Message Adapter: Moshi +POM_PACKAGING=jar \ No newline at end of file diff --git a/scarlet-message-adapter-protobuf/build.gradle b/scarlet-message-adapter-protobuf/build.gradle index 7d905bf3..64ee1f86 100755 --- a/scarlet-message-adapter-protobuf/build.gradle +++ b/scarlet-message-adapter-protobuf/build.gradle @@ -1,7 +1,6 @@ +apply plugin: 'com.vanniktech.maven.publish' apply plugin: 'kotlin' apply plugin: 'java-library' -apply plugin: 'org.jetbrains.dokka' -apply plugin: 'maven-publish' dependencies { api rootProject.ext.protobuf @@ -16,58 +15,4 @@ dependencies { testImplementation rootProject.ext.mockito testImplementation rootProject.ext.kotlinReflect testImplementation rootProject.ext.assertJ -} - -dokka { - outputFormat = 'javadoc' - outputDirectory = "$buildDir/javadoc" -} - -task sourcesJar(type: Jar, dependsOn: classes) { - classifier = 'sources' - from sourceSets.main.allSource -} - -task dokkaJavadoc(type: org.jetbrains.dokka.gradle.DokkaTask) { - outputFormat = 'javadoc' - outputDirectory = javadoc.destinationDir -} - -task javadocJar(type: Jar, dependsOn: dokkaJavadoc) { - classifier = 'javadoc' - from javadoc.destinationDir -} - -artifacts { - archives sourcesJar, javadocJar -} - -publishing { - publications { - mavenJava(MavenPublication) { - groupId 'com.tinder' - version version - artifactId project.getName() - artifact sourcesJar - artifact javadocJar - from components.java - } - } -} - -artifactory { - contextUrl = 'https://tinder.jfrog.io/tinder' - publish { - repository { - repoKey = 'libs-release-local' - username = System.getenv("ARTIFACTORY_USER") - password = System.getenv("ARTIFACTORY_PASSWORD") - maven = true - } - defaults { - publications('mavenJava') - publishArtifacts = true - publishPom = true - } - } -} +} \ No newline at end of file diff --git a/scarlet-message-adapter-protobuf/gradle.properties b/scarlet-message-adapter-protobuf/gradle.properties new file mode 100644 index 00000000..f37d5ba3 --- /dev/null +++ b/scarlet-message-adapter-protobuf/gradle.properties @@ -0,0 +1,3 @@ +POM_ARTIFACT_ID=message-adapter-protobuf +POM_NAME=Message Adapter: ProtoBuf +POM_PACKAGING=jar \ No newline at end of file diff --git a/scarlet-stream-adapter-builtin/build.gradle b/scarlet-stream-adapter-builtin/build.gradle index 0527cd6c..1490857a 100644 --- a/scarlet-stream-adapter-builtin/build.gradle +++ b/scarlet-stream-adapter-builtin/build.gradle @@ -1,6 +1,5 @@ +apply plugin: 'com.vanniktech.maven.publish' apply plugin: 'kotlin' -apply plugin: 'java-library' -apply plugin: 'maven-publish' dependencies { implementation project(':scarlet-core') @@ -11,42 +10,4 @@ dependencies { testImplementation rootProject.ext.mockito testImplementation rootProject.ext.kotlinReflect testImplementation rootProject.ext.assertJ -} - -task sourcesJar(type: Jar, dependsOn: classes) { - classifier = 'sources' - from sourceSets.main.allSource -} - -artifacts { - archives sourcesJar -} - -publishing { - publications { - mavenJava(MavenPublication) { - groupId 'com.tinder' - version version - artifactId project.getName() - artifact sourcesJar - from components.java - } - } -} - -artifactory { - contextUrl = 'https://tinder.jfrog.io/tinder' - publish { - repository { - repoKey = 'libs-release-local' - username = System.getenv("ARTIFACTORY_USER") - password = System.getenv("ARTIFACTORY_PASSWORD") - maven = true - } - defaults { - publications('mavenJava') - publishArtifacts = true - publishPom = true - } - } -} +} \ No newline at end of file diff --git a/scarlet-stream-adapter-builtin/gradle.properties b/scarlet-stream-adapter-builtin/gradle.properties new file mode 100644 index 00000000..41a9dc0d --- /dev/null +++ b/scarlet-stream-adapter-builtin/gradle.properties @@ -0,0 +1,3 @@ +POM_ARTIFACT_ID=stream-adapter-built-in +POM_NAME=Stream Adapter: Built-In +POM_PACKAGING=jar \ No newline at end of file diff --git a/scarlet-stream-adapter-coroutines/build.gradle b/scarlet-stream-adapter-coroutines/build.gradle index 8a20666a..30e825af 100644 --- a/scarlet-stream-adapter-coroutines/build.gradle +++ b/scarlet-stream-adapter-coroutines/build.gradle @@ -1,7 +1,6 @@ +apply plugin: 'com.vanniktech.maven.publish' apply plugin: 'kotlin' apply plugin: 'java-library' -apply plugin: 'org.jetbrains.dokka' -apply plugin: 'maven-publish' dependencies { api rootProject.ext.kotlinCoroutines @@ -18,57 +17,3 @@ dependencies { testImplementation rootProject.ext.kotlinReflect testImplementation rootProject.ext.assertJ } - -dokka { - outputFormat = 'javadoc' - outputDirectory = "$buildDir/javadoc" -} - -task sourcesJar(type: Jar, dependsOn: classes) { - classifier = 'sources' - from sourceSets.main.allSource -} - -task dokkaJavadoc(type: org.jetbrains.dokka.gradle.DokkaTask) { - outputFormat = 'javadoc' - outputDirectory = javadoc.destinationDir -} - -task javadocJar(type: Jar, dependsOn: dokkaJavadoc) { - classifier = 'javadoc' - from javadoc.destinationDir -} - -artifacts { - archives sourcesJar, javadocJar -} - -publishing { - publications { - mavenJava(MavenPublication) { - groupId 'com.tinder' - version version - artifactId project.getName() - artifact sourcesJar - artifact javadocJar - from components.java - } - } -} - -artifactory { - contextUrl = 'https://tinder.jfrog.io/tinder' - publish { - repository { - repoKey = 'libs-release-local' - username = System.getenv("ARTIFACTORY_USER") - password = System.getenv("ARTIFACTORY_PASSWORD") - maven = true - } - defaults { - publications('mavenJava') - publishArtifacts = true - publishPom = true - } - } -} diff --git a/scarlet-stream-adapter-coroutines/gradle.properties b/scarlet-stream-adapter-coroutines/gradle.properties new file mode 100644 index 00000000..2b91cc3b --- /dev/null +++ b/scarlet-stream-adapter-coroutines/gradle.properties @@ -0,0 +1,3 @@ +POM_ARTIFACT_ID=stream-adapter-coroutines +POM_NAME=Stream Adapter: Coroutines +POM_PACKAGING=jar \ No newline at end of file diff --git a/scarlet-stream-adapter-rxjava/build.gradle b/scarlet-stream-adapter-rxjava/build.gradle index 1145c482..263e5c98 100755 --- a/scarlet-stream-adapter-rxjava/build.gradle +++ b/scarlet-stream-adapter-rxjava/build.gradle @@ -1,7 +1,6 @@ +apply plugin: 'com.vanniktech.maven.publish' apply plugin: 'kotlin' apply plugin: 'java-library' -apply plugin: 'org.jetbrains.dokka' -apply plugin: 'maven-publish' dependencies { api rootProject.ext.rxJava1 @@ -17,57 +16,3 @@ dependencies { testImplementation rootProject.ext.kotlinReflect testImplementation rootProject.ext.assertJ } - -dokka { - outputFormat = 'javadoc' - outputDirectory = "$buildDir/javadoc" -} - -task sourcesJar(type: Jar, dependsOn: classes) { - classifier = 'sources' - from sourceSets.main.allSource -} - -task dokkaJavadoc(type: org.jetbrains.dokka.gradle.DokkaTask) { - outputFormat = 'javadoc' - outputDirectory = javadoc.destinationDir -} - -task javadocJar(type: Jar, dependsOn: dokkaJavadoc) { - classifier = 'javadoc' - from javadoc.destinationDir -} - -artifacts { - archives sourcesJar, javadocJar -} - -publishing { - publications { - mavenJava(MavenPublication) { - groupId 'com.tinder' - version version - artifactId project.getName() - artifact sourcesJar - artifact javadocJar - from components.java - } - } -} - -artifactory { - contextUrl = 'https://tinder.jfrog.io/tinder' - publish { - repository { - repoKey = 'libs-release-local' - username = System.getenv("ARTIFACTORY_USER") - password = System.getenv("ARTIFACTORY_PASSWORD") - maven = true - } - defaults { - publications('mavenJava') - publishArtifacts = true - publishPom = true - } - } -} diff --git a/scarlet-stream-adapter-rxjava/gradle.properties b/scarlet-stream-adapter-rxjava/gradle.properties new file mode 100644 index 00000000..efbbcac9 --- /dev/null +++ b/scarlet-stream-adapter-rxjava/gradle.properties @@ -0,0 +1,3 @@ +POM_ARTIFACT_ID=stream-adapter-rxjava1 +POM_NAME=Stream Adapter: RxJava1 +POM_PACKAGING=jar \ No newline at end of file diff --git a/scarlet-stream-adapter-rxjava2/build.gradle b/scarlet-stream-adapter-rxjava2/build.gradle index 52f79154..85e124a1 100755 --- a/scarlet-stream-adapter-rxjava2/build.gradle +++ b/scarlet-stream-adapter-rxjava2/build.gradle @@ -1,7 +1,6 @@ +apply plugin: 'com.vanniktech.maven.publish' apply plugin: 'kotlin' apply plugin: 'java-library' -apply plugin: 'org.jetbrains.dokka' -apply plugin: 'maven-publish' dependencies { api rootProject.ext.rxJava @@ -17,57 +16,3 @@ dependencies { testImplementation rootProject.ext.kotlinReflect testImplementation rootProject.ext.assertJ } - -dokka { - outputFormat = 'javadoc' - outputDirectory = "$buildDir/javadoc" -} - -task sourcesJar(type: Jar, dependsOn: classes) { - classifier = 'sources' - from sourceSets.main.allSource -} - -task dokkaJavadoc(type: org.jetbrains.dokka.gradle.DokkaTask) { - outputFormat = 'javadoc' - outputDirectory = javadoc.destinationDir -} - -task javadocJar(type: Jar, dependsOn: dokkaJavadoc) { - classifier = 'javadoc' - from javadoc.destinationDir -} - -artifacts { - archives sourcesJar, javadocJar -} - -publishing { - publications { - mavenJava(MavenPublication) { - groupId 'com.tinder' - version version - artifactId project.getName() - artifact sourcesJar - artifact javadocJar - from components.java - } - } -} - -artifactory { - contextUrl = 'https://tinder.jfrog.io/tinder' - publish { - repository { - repoKey = 'libs-release-local' - username = System.getenv("ARTIFACTORY_USER") - password = System.getenv("ARTIFACTORY_PASSWORD") - maven = true - } - defaults { - publications('mavenJava') - publishArtifacts = true - publishPom = true - } - } -} diff --git a/scarlet-stream-adapter-rxjava2/gradle.properties b/scarlet-stream-adapter-rxjava2/gradle.properties new file mode 100644 index 00000000..b6385a6f --- /dev/null +++ b/scarlet-stream-adapter-rxjava2/gradle.properties @@ -0,0 +1,3 @@ +POM_ARTIFACT_ID=stream-adapter-rxjava2 +POM_NAME=Stream Adapter: RxJava2 +POM_PACKAGING=jar \ No newline at end of file diff --git a/scarlet-test-utils/build.gradle b/scarlet-test-utils/build.gradle index 9d7ae68b..c6d5855f 100644 --- a/scarlet-test-utils/build.gradle +++ b/scarlet-test-utils/build.gradle @@ -1,65 +1,10 @@ +apply plugin: 'com.vanniktech.maven.publish' apply plugin: 'kotlin' apply plugin: 'java-library' -apply plugin: 'org.jetbrains.dokka' -apply plugin: 'maven-publish' dependencies { compileOnly project(':scarlet') api rootProject.ext.assertJ implementation rootProject.ext.rxJava implementation rootProject.ext.kotlinStdlib -} - -dokka { - outputFormat = 'javadoc' - outputDirectory = "$buildDir/javadoc" -} - -task sourcesJar(type: Jar, dependsOn: classes) { - classifier = 'sources' - from sourceSets.main.allSource -} - -task dokkaJavadoc(type: org.jetbrains.dokka.gradle.DokkaTask) { - outputFormat = 'javadoc' - outputDirectory = javadoc.destinationDir -} - -task javadocJar(type: Jar, dependsOn: dokkaJavadoc) { - classifier = 'javadoc' - from javadoc.destinationDir -} - -artifacts { - archives sourcesJar, javadocJar -} - -publishing { - publications { - mavenJava(MavenPublication) { - groupId 'com.tinder' - version version - artifactId project.getName() - artifact sourcesJar - artifact javadocJar - from components.java - } - } -} - -artifactory { - contextUrl = 'https://tinder.jfrog.io/tinder' - publish { - repository { - repoKey = 'libs-release-local' - username = System.getenv("ARTIFACTORY_USER") - password = System.getenv("ARTIFACTORY_PASSWORD") - maven = true - } - defaults { - publications('mavenJava') - publishArtifacts = true - publishPom = true - } - } -} +} \ No newline at end of file diff --git a/scarlet-test-utils/gradle.properties b/scarlet-test-utils/gradle.properties new file mode 100644 index 00000000..9ccc2b23 --- /dev/null +++ b/scarlet-test-utils/gradle.properties @@ -0,0 +1,3 @@ +POM_ARTIFACT_ID=test-utils +POM_NAME=Test Utilities +POM_PACKAGING=jar \ No newline at end of file diff --git a/scarlet-websocket-mockwebserver/build.gradle b/scarlet-websocket-mockwebserver/build.gradle index d6ab5691..25dc80da 100644 --- a/scarlet-websocket-mockwebserver/build.gradle +++ b/scarlet-websocket-mockwebserver/build.gradle @@ -1,64 +1,9 @@ +apply plugin: 'com.vanniktech.maven.publish' apply plugin: 'kotlin' apply plugin: 'java-library' -apply plugin: 'org.jetbrains.dokka' -apply plugin: 'maven-publish' dependencies { api rootProject.ext.mockWebServer api project(':scarlet-websocket-okhttp') implementation rootProject.ext.kotlinStdlib -} - -dokka { - outputFormat = 'javadoc' - outputDirectory = "$buildDir/javadoc" -} - -task sourcesJar(type: Jar, dependsOn: classes) { - classifier = 'sources' - from sourceSets.main.allSource -} - -task dokkaJavadoc(type: org.jetbrains.dokka.gradle.DokkaTask) { - outputFormat = 'javadoc' - outputDirectory = javadoc.destinationDir -} - -task javadocJar(type: Jar, dependsOn: dokkaJavadoc) { - classifier = 'javadoc' - from javadoc.destinationDir -} - -artifacts { - archives sourcesJar, javadocJar -} - -publishing { - publications { - mavenJava(MavenPublication) { - groupId 'com.tinder' - version version - artifactId project.getName() - artifact sourcesJar - artifact javadocJar - from components.java - } - } -} - -artifactory { - contextUrl = 'https://tinder.jfrog.io/tinder' - publish { - repository { - repoKey = 'libs-release-local' - username = System.getenv("ARTIFACTORY_USER") - password = System.getenv("ARTIFACTORY_PASSWORD") - maven = true - } - defaults { - publications('mavenJava') - publishArtifacts = true - publishPom = true - } - } -} +} \ No newline at end of file diff --git a/scarlet-websocket-mockwebserver/gradle.properties b/scarlet-websocket-mockwebserver/gradle.properties new file mode 100644 index 00000000..458f2372 --- /dev/null +++ b/scarlet-websocket-mockwebserver/gradle.properties @@ -0,0 +1,3 @@ +POM_ARTIFACT_ID=websocket-mockwebserver +POM_NAME=Websocket Mock Web Serber +POM_PACKAGING=jar \ No newline at end of file diff --git a/scarlet-websocket-okhttp/build.gradle b/scarlet-websocket-okhttp/build.gradle index af62581d..28863d99 100644 --- a/scarlet-websocket-okhttp/build.gradle +++ b/scarlet-websocket-okhttp/build.gradle @@ -1,7 +1,6 @@ +apply plugin: 'com.vanniktech.maven.publish' apply plugin: 'kotlin' apply plugin: 'java-library' -apply plugin: 'org.jetbrains.dokka' -apply plugin: 'maven-publish' dependencies { api project(':scarlet-core') @@ -19,57 +18,3 @@ dependencies { testImplementation rootProject.ext.kotlinReflect testImplementation rootProject.ext.assertJ } - -dokka { - outputFormat = 'javadoc' - outputDirectory = "$buildDir/javadoc" -} - -task sourcesJar(type: Jar, dependsOn: classes) { - classifier = 'sources' - from sourceSets.main.allSource -} - -task dokkaJavadoc(type: org.jetbrains.dokka.gradle.DokkaTask) { - outputFormat = 'javadoc' - outputDirectory = javadoc.destinationDir -} - -task javadocJar(type: Jar, dependsOn: dokkaJavadoc) { - classifier = 'javadoc' - from javadoc.destinationDir -} - -artifacts { - archives sourcesJar, javadocJar -} - -publishing { - publications { - mavenJava(MavenPublication) { - groupId 'com.tinder' - version version - artifactId project.getName() - artifact sourcesJar - artifact javadocJar - from components.java - } - } -} - -artifactory { - contextUrl = 'https://tinder.jfrog.io/tinder' - publish { - repository { - repoKey = 'libs-release-local' - username = System.getenv("ARTIFACTORY_USER") - password = System.getenv("ARTIFACTORY_PASSWORD") - maven = true - } - defaults { - publications('mavenJava') - publishArtifacts = true - publishPom = true - } - } -} diff --git a/scarlet-websocket-okhttp/gradle.properties b/scarlet-websocket-okhttp/gradle.properties new file mode 100644 index 00000000..e79feda4 --- /dev/null +++ b/scarlet-websocket-okhttp/gradle.properties @@ -0,0 +1,3 @@ +POM_ARTIFACT_ID=websocket-okhttp +POM_NAME=Websocket OkHttp Plugin +POM_PACKAGING=jar \ No newline at end of file diff --git a/scarlet/build.gradle b/scarlet/build.gradle index 312f9ee9..965693f2 100644 --- a/scarlet/build.gradle +++ b/scarlet/build.gradle @@ -1,7 +1,6 @@ +apply plugin: 'com.vanniktech.maven.publish' apply plugin: 'kotlin' apply plugin: 'java-library' -apply plugin: 'org.jetbrains.dokka' -apply plugin: 'maven-publish' dependencies { api project(':scarlet-core') @@ -21,62 +20,3 @@ dependencies { testImplementation rootProject.ext.kotlinReflect testImplementation rootProject.ext.assertJ } -repositories { - mavenCentral() - google() -} - -dokka { - outputFormat = 'javadoc' - outputDirectory = "$buildDir/javadoc" -} - -task sourcesJar(type: Jar, dependsOn: classes) { - classifier = 'sources' - from sourceSets.main.allSource -} - -task dokkaJavadoc(type: org.jetbrains.dokka.gradle.DokkaTask) { - outputFormat = 'javadoc' - outputDirectory = javadoc.destinationDir -} - -task javadocJar(type: Jar, dependsOn: dokkaJavadoc) { - classifier = 'javadoc' - from javadoc.destinationDir -} - -artifacts { - archives sourcesJar, javadocJar -} - -publishing { - publications { - mavenJava(MavenPublication) { - groupId 'com.tinder' - version version - artifactId project.getName() - artifact sourcesJar - artifact javadocJar - from components.java - } - } -} - -artifactory { - contextUrl = 'https://tinder.jfrog.io/tinder' - publish { - repository { - repoKey = 'libs-release-local' - username = System.getenv("ARTIFACTORY_USER") - password = System.getenv("ARTIFACTORY_PASSWORD") - maven = true - } - defaults { - publications('mavenJava') - publishArtifacts = true - publishPom = true - } - } - clientConfig.info.setBuildName('com.tinder.scarlet') -} diff --git a/scarlet/gradle.properties b/scarlet/gradle.properties new file mode 100644 index 00000000..f23a9ba9 --- /dev/null +++ b/scarlet/gradle.properties @@ -0,0 +1,3 @@ +POM_ARTIFACT_ID=scarlet +POM_NAME=Scarlet +POM_PACKAGING=jar \ No newline at end of file