From 23b53a8b2e66dbc3bb83c3193ecf7127de1370d8 Mon Sep 17 00:00:00 2001
From: Szczepan Faber <s.faber@airbnb.com>
Date: Mon, 25 Jan 2021 07:55:08 -0600
Subject: Fixed CI bugs

---
 .github/workflows/ci.yml | 6 +++---
 gradle/publishing.gradle | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4094914..bd37f8a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -65,7 +65,7 @@ jobs:
     - name: 3. Build with Kotlin ${{ matrix.kotlin }} and mock-maker ${{ matrix.mock-maker }}
       run: |
         ops/mockMakerInline.sh
-        ./gradlew build bintrayUpload idea -PbintrayDryRun
+        ./gradlew build bintrayUpload -PbintrayDryRun
       env:
         KOTLIN_VERSION: ${{ matrix.kotlin }}
         MOCK_MAKER: ${{ matrix.mock-maker }}
@@ -96,8 +96,8 @@ jobs:
 
     - name: Build and publish to Bintray/MavenCentral
       run: ./gradlew tasks # TODO, in progress: bintrayUpload githubRelease
-#      env:
-#        GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+      env:
+        GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
 #        BINTRAY_API_KEY: ${{secrets.BINTRAY_API_KEY}}
 #        NEXUS_TOKEN_USER: ${{secrets.NEXUS_TOKEN_USER}}
 #        NEXUS_TOKEN_PWD: ${{secrets.NEXUS_TOKEN_PWD}}
diff --git a/gradle/publishing.gradle b/gradle/publishing.gradle
index 00194a6..722f59a 100644
--- a/gradle/publishing.gradle
+++ b/gradle/publishing.gradle
@@ -14,7 +14,7 @@ task sourceJar(type: Jar) {
 
 publishing {
     publications {
-        mavenJava(MavenPublication) {
+        javaLibrary(MavenPublication) {
             artifactId 'mockito-kotlin'
 
             from components.java
@@ -75,7 +75,7 @@ bintray {
     publish = false //can be changed to 'false' for testing
     dryRun = project.hasProperty('bintrayDryRun')
 
-    publications = ['mavenJava']
+    publications = ['javaLibrary']
 
     pkg {
         repo = 'test' //https://bintray.com/mockito/maven // TODO change to 'maaven' when CI ready
-- 
cgit v1.2.3