From 03bd790a945a249977738dd0d50265e66d533e1f Mon Sep 17 00:00:00 2001 From: Roman Iatcyna Date: Wed, 21 Oct 2020 12:56:36 +0100 Subject: [PATCH] Automated Bintray Uploads and version updates --- .../animators_publish_bintray_action.yml | 22 +++++++++++++++++++ .../decorations_publish_bintray_action.yml | 22 +++++++++++++++++++ .../delegates_publish_bintray_action.yml | 22 +++++++++++++++++++ .../kextenstions_publish_bintray_action.yml | 22 +++++++++++++++++++ .../rxdiffadapter_publish_bintray_action.yml | 22 +++++++++++++++++++ animators/build.gradle | 16 +++++++++----- app/build.gradle | 8 +++---- build.gradle | 6 ++--- decorations/build.gradle | 18 +++++++++------ delegates/build.gradle | 8 +++++-- gradle/wrapper/gradle-wrapper.properties | 2 +- kextensions/build.gradle | 8 +++++-- rxdiffadapter/build.gradle | 10 ++++++--- 13 files changed, 158 insertions(+), 28 deletions(-) create mode 100644 .github/workflows/animators_publish_bintray_action.yml create mode 100644 .github/workflows/decorations_publish_bintray_action.yml create mode 100644 .github/workflows/delegates_publish_bintray_action.yml create mode 100644 .github/workflows/kextenstions_publish_bintray_action.yml create mode 100644 .github/workflows/rxdiffadapter_publish_bintray_action.yml diff --git a/.github/workflows/animators_publish_bintray_action.yml b/.github/workflows/animators_publish_bintray_action.yml new file mode 100644 index 0000000..c48d91b --- /dev/null +++ b/.github/workflows/animators_publish_bintray_action.yml @@ -0,0 +1,22 @@ +name: "core: publish (animators)" + +on: + release: + types: [published] + +jobs: + publish-bintray: + runs-on: ubuntu-latest + if: startsWith(github.ref, 'refs/tags/animators') + + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-java@v1 + with: + java-version: 11 + - uses: eskatos/gradle-command-action@v1 + with: + arguments: :animators:bintrayUpload -PdryRun=false + env: + BINTRAY_USER: yatsinar + BINTRAY_KEY: ${{ secrets.BINTRAY_KEY }} \ No newline at end of file diff --git a/.github/workflows/decorations_publish_bintray_action.yml b/.github/workflows/decorations_publish_bintray_action.yml new file mode 100644 index 0000000..ab756dd --- /dev/null +++ b/.github/workflows/decorations_publish_bintray_action.yml @@ -0,0 +1,22 @@ +name: "core: publish (decorations)" + +on: + release: + types: [published] + +jobs: + publish-bintray: + runs-on: ubuntu-latest + if: startsWith(github.ref, 'refs/tags/decorations') + + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-java@v1 + with: + java-version: 11 + - uses: eskatos/gradle-command-action@v1 + with: + arguments: :decorations:bintrayUpload -PdryRun=false + env: + BINTRAY_USER: yatsinar + BINTRAY_KEY: ${{ secrets.BINTRAY_KEY }} \ No newline at end of file diff --git a/.github/workflows/delegates_publish_bintray_action.yml b/.github/workflows/delegates_publish_bintray_action.yml new file mode 100644 index 0000000..6a45221 --- /dev/null +++ b/.github/workflows/delegates_publish_bintray_action.yml @@ -0,0 +1,22 @@ +name: "core: publish (delegates)" + +on: + release: + types: [published] + +jobs: + publish-bintray: + runs-on: ubuntu-latest + if: startsWith(github.ref, 'refs/tags/delegates') + + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-java@v1 + with: + java-version: 11 + - uses: eskatos/gradle-command-action@v1 + with: + arguments: :delegates:bintrayUpload -PdryRun=false + env: + BINTRAY_USER: yatsinar + BINTRAY_KEY: ${{ secrets.BINTRAY_KEY }} \ No newline at end of file diff --git a/.github/workflows/kextenstions_publish_bintray_action.yml b/.github/workflows/kextenstions_publish_bintray_action.yml new file mode 100644 index 0000000..d7accaf --- /dev/null +++ b/.github/workflows/kextenstions_publish_bintray_action.yml @@ -0,0 +1,22 @@ +name: "core: publish (kextensions)" + +on: + release: + types: [published] + +jobs: + publish-bintray: + runs-on: ubuntu-latest + if: startsWith(github.ref, 'refs/tags/kextensions') + + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-java@v1 + with: + java-version: 11 + - uses: eskatos/gradle-command-action@v1 + with: + arguments: :kextensions:bintrayUpload -PdryRun=false + env: + BINTRAY_USER: yatsinar + BINTRAY_KEY: ${{ secrets.BINTRAY_KEY }} \ No newline at end of file diff --git a/.github/workflows/rxdiffadapter_publish_bintray_action.yml b/.github/workflows/rxdiffadapter_publish_bintray_action.yml new file mode 100644 index 0000000..a6c6b45 --- /dev/null +++ b/.github/workflows/rxdiffadapter_publish_bintray_action.yml @@ -0,0 +1,22 @@ +name: "core: publish (rxdiffadapter)" + +on: + release: + types: [published] + +jobs: + publish-bintray: + runs-on: ubuntu-latest + if: startsWith(github.ref, 'refs/tags/rxdiffadapter') + + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-java@v1 + with: + java-version: 11 + - uses: eskatos/gradle-command-action@v1 + with: + arguments: :rxdiffadapter:bintrayUpload -PdryRun=false + env: + BINTRAY_USER: yatsinar + BINTRAY_KEY: ${{ secrets.BINTRAY_KEY }} \ No newline at end of file diff --git a/animators/build.gradle b/animators/build.gradle index fbad071..43b4c76 100644 --- a/animators/build.gradle +++ b/animators/build.gradle @@ -15,6 +15,10 @@ android { } + kotlinOptions { + jvmTarget = '1.8' + } + buildTypes { release { minifyEnabled false @@ -28,13 +32,13 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "androidx.recyclerview:recyclerview:$recycler_version" - androidTestImplementation 'androidx.test:runner:1.2.0' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' + androidTestImplementation 'androidx.test:runner:1.3.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' - testImplementation 'junit:junit:4.12' - testImplementation 'org.robolectric:robolectric:4.3' + testImplementation 'junit:junit:4.13' + testImplementation 'org.robolectric:robolectric:4.4' testImplementation 'com.nhaarman:mockito-kotlin:1.5.0' - testImplementation "org.mockito:mockito-core:3.0.0" + testImplementation "org.mockito:mockito-core:3.5.10" api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" } @@ -46,7 +50,7 @@ repositories { publish { def groupProjectID = 'com.revolut.recyclerkit' def artifactProjectID = 'animators' - def publishVersionID = '1.0.10' + def publishVersionID = '1.0.11' bintrayUser = System.getenv("BINTRAY_USER") bintrayKey = System.getenv("BINTRAY_KEY") diff --git a/app/build.gradle b/app/build.gradle index a72f170..5620933 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -26,12 +26,12 @@ androidExtensions { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'androidx.constraintlayout:constraintlayout:2.0.2' implementation "androidx.recyclerview:recyclerview:$recycler_version" - implementation 'androidx.appcompat:appcompat:1.1.0' - implementation 'com.github.bumptech.glide:glide:4.9.0' + implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'com.github.bumptech.glide:glide:4.11.0' api 'com.thedeanda:lorem:2.1' - annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0' + annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0' implementation project(':animators') implementation project(':delegates') implementation project(':decorations') diff --git a/build.gradle b/build.gradle index 3e94294..89031cb 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.50' + ext.kotlin_version = '1.3.72' ext.recycler_version = '1.1.0' repositories { @@ -9,9 +9,9 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.1' + classpath 'com.android.tools.build:gradle:3.6.4' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath 'com.novoda:bintray-release:0.9.1' + classpath 'com.novoda:bintray-release:0.9.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/decorations/build.gradle b/decorations/build.gradle index 14a99dc..5977e54 100644 --- a/decorations/build.gradle +++ b/decorations/build.gradle @@ -5,7 +5,7 @@ apply plugin: 'com.novoda.bintray-release' android { compileSdkVersion 29 - buildToolsVersion "29.0.2" + buildToolsVersion "29.0.3" defaultConfig { @@ -18,6 +18,10 @@ android { consumerProguardFiles 'consumer-rules.pro' } + kotlinOptions { + jvmTarget = '1.8' + } + buildTypes { release { minifyEnabled false @@ -31,19 +35,19 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation project(':delegates') - implementation 'androidx.appcompat:appcompat:1.1.0' - implementation 'androidx.core:core-ktx:1.1.0' + implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'androidx.core:core-ktx:1.3.2' - testImplementation 'junit:junit:4.12' - testImplementation 'org.robolectric:robolectric:4.3' + testImplementation 'junit:junit:4.13' + testImplementation 'org.robolectric:robolectric:4.4' testImplementation 'com.nhaarman:mockito-kotlin:1.5.0' - testImplementation "org.mockito:mockito-core:3.0.0" + testImplementation "org.mockito:mockito-core:3.5.10" } publish { def groupProjectID = 'com.revolut.recyclerkit' def artifactProjectID = 'decorations' - def publishVersionID = '1.0.7' + def publishVersionID = '1.0.8' bintrayUser = System.getenv("BINTRAY_USER") bintrayKey = System.getenv("BINTRAY_KEY") diff --git a/delegates/build.gradle b/delegates/build.gradle index 8a3949a..135e02f 100644 --- a/delegates/build.gradle +++ b/delegates/build.gradle @@ -15,6 +15,10 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } + kotlinOptions { + jvmTarget = '1.8' + } + buildTypes { release { minifyEnabled false @@ -28,7 +32,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) api "androidx.recyclerview:recyclerview:$recycler_version" - testImplementation 'junit:junit:4.12' + testImplementation 'junit:junit:4.13' api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" } repositories { @@ -38,7 +42,7 @@ repositories { publish { def groupProjectID = 'com.revolut.recyclerkit' def artifactProjectID = 'delegates' - def publishVersionID = '1.0.9' + def publishVersionID = '1.0.10' bintrayUser = System.getenv("BINTRAY_USER") bintrayKey = System.getenv("BINTRAY_KEY") diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8629dbc..5202e6f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip diff --git a/kextensions/build.gradle b/kextensions/build.gradle index 78ff856..81a3c7c 100644 --- a/kextensions/build.gradle +++ b/kextensions/build.gradle @@ -5,7 +5,7 @@ apply plugin: 'com.novoda.bintray-release' android { compileSdkVersion 29 - buildToolsVersion "29.0.2" + buildToolsVersion "29.0.3" defaultConfig { minSdkVersion 19 @@ -16,6 +16,10 @@ android { consumerProguardFiles "consumer-rules.pro" } + kotlinOptions { + jvmTarget = '1.8' + } + buildTypes { release { minifyEnabled false @@ -35,7 +39,7 @@ dependencies { publish { def groupProjectID = 'com.revolut.recyclerkit' def artifactProjectID = 'kextensions' - def publishVersionID = '1.0.6' + def publishVersionID = '1.0.7' bintrayUser = System.getenv("BINTRAY_USER") bintrayKey = System.getenv("BINTRAY_KEY") diff --git a/rxdiffadapter/build.gradle b/rxdiffadapter/build.gradle index c404b97..36dc1e3 100644 --- a/rxdiffadapter/build.gradle +++ b/rxdiffadapter/build.gradle @@ -4,7 +4,7 @@ apply plugin: 'com.novoda.bintray-release' android { compileSdkVersion 29 - buildToolsVersion "29.0.2" + buildToolsVersion "29.0.3" defaultConfig { minSdkVersion 19 @@ -16,6 +16,10 @@ android { consumerProguardFiles 'consumer-rules.pro' } + kotlinOptions { + jvmTarget = '1.8' + } + buildTypes { release { minifyEnabled false @@ -28,14 +32,14 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation project(':delegates') - implementation "io.reactivex.rxjava2:rxjava:2.2.10" + implementation "io.reactivex.rxjava2:rxjava:2.2.18" implementation "io.reactivex.rxjava2:rxandroid:2.1.1" } publish { def groupProjectID = 'com.revolut.recyclerkit' def artifactProjectID = 'rxdiffadapter' - def publishVersionID = '1.0.6' + def publishVersionID = '1.0.7' bintrayUser = System.getenv("BINTRAY_USER") bintrayKey = System.getenv("BINTRAY_KEY")