Skip to content

Commit

Permalink
Merge pull request KasperskyLab#477 from KasperskyLab/TECH-snapshot-c…
Browse files Browse the repository at this point in the history
…hecks

TECH: added new github workflow; use kaspresso snapshot dependency if…
  • Loading branch information
Nikitae57 authored Jan 12, 2023
2 parents 1b87ac9 + 55e62e7 commit 4fdda1b
Show file tree
Hide file tree
Showing 5 changed files with 65 additions and 8 deletions.
30 changes: 30 additions & 0 deletions .github/workflows/snapshot_check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# This workflow is triggered manually before release

name: Snapshot Checks

on:
workflow_dispatch:
inputs:
kaspressoVersion:
description: 'Kaspresso Version (for example 1.5.1-SNAPSHOT)'
required: true
type: string

jobs:
snapshot-check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/cache@v1
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
restore-keys: |
${{ runner.os }}-gradle-
- name: Set up JDK
uses: actions/setup-java@v2
with:
distribution: 'adopt'
java-version: 11
- name: Assemble projects
run: ./gradlew -Pkaspresso.snapshotVersion=${{ inputs.kaspressoVersion }} assembleDebugAndroidTest
11 changes: 9 additions & 2 deletions samples/kaspresso-allure-support-sample/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,15 @@ dependencies {
implementation(libs.constraint)
implementation(libs.multidex)

androidTestImplementation(projects.kaspresso)
androidTestImplementation(projects.allureSupport)
// kaspresso
if (hasProperty("kaspresso.snapshotVersion")) {
val kaspressoVersion = property("kaspresso.snapshotVersion")
androidTestImplementation("com.kaspersky.android-components:kaspresso:$kaspressoVersion")
androidTestImplementation("com.kaspersky.android-components:kaspresso-allure-support:$kaspressoVersion")
} else {
androidTestImplementation(projects.kaspresso)
androidTestImplementation(projects.allureSupport)
}

androidTestImplementation(libs.androidXTestExtJunitKtx)
androidTestImplementation(libs.androidXTestExtJunit)
Expand Down
18 changes: 14 additions & 4 deletions samples/kaspresso-compose-support-sample/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,24 @@ dependencies {
implementation(libs.lifecycleViewModelComposeKtx)
implementation(libs.composeRuntimeLiveData)

androidTestImplementation(projects.kaspresso)
androidTestImplementation(projects.composeSupport)
// kaspresso
if (hasProperty("kaspresso.snapshotVersion")) {
val kaspressoVersion = property("kaspresso.snapshotVersion")
testImplementation("com.kaspersky.android-components:kaspresso:$kaspressoVersion")
testImplementation("com.kaspersky.android-components:kaspresso-compose-support:$kaspressoVersion")
androidTestImplementation("com.kaspersky.android-components:kaspresso:$kaspressoVersion")
androidTestImplementation("com.kaspersky.android-components:kaspresso-compose-support:$kaspressoVersion")
} else {
testImplementation(projects.kaspresso)
testImplementation(projects.composeSupport)
androidTestImplementation(projects.kaspresso)
androidTestImplementation(projects.composeSupport)
}

androidTestImplementation(libs.androidXTestRunner)
androidTestImplementation(libs.junit)
androidTestImplementation(libs.composeUiTestJunit)

testImplementation(projects.kaspresso)
testImplementation(projects.composeSupport)
testImplementation(libs.androidXTestRunner)
testImplementation(libs.junit)
testImplementation(libs.composeUiTestJunit)
Expand Down
13 changes: 11 additions & 2 deletions samples/kaspresso-sample/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,23 @@ dependencies {
implementation(libs.androidXLifecycleRuntimeKtx)

androidTestImplementation(libs.junit)
androidTestImplementation(projects.kaspresso)

// kaspresso
if (hasProperty("kaspresso.snapshotVersion")) {
val kaspressoVersion = property("kaspresso.snapshotVersion")
testImplementation("com.kaspersky.android-components:kaspresso:$kaspressoVersion")
androidTestImplementation("com.kaspersky.android-components:kaspresso:$kaspressoVersion")
} else {
androidTestImplementation(projects.kaspresso)
testImplementation(projects.kaspresso)
}

androidTestImplementation(libs.androidXTestRunner)
androidTestImplementation(libs.androidXTestRules)
androidTestImplementation(libs.androidXTestExtJunitKtx)
androidTestImplementation(libs.androidXTestExtJunit)

testImplementation(libs.junit)
testImplementation(projects.kaspresso)
testImplementation(libs.androidXTestRunner)
testImplementation(libs.androidXTestRules)
testImplementation(libs.androidXTestExtJunitKtx)
Expand Down
1 change: 1 addition & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ dependencyResolutionManagement {
mavenLocal()
google()
maven { url = uri("https://kotlin.bintray.com/kotlinx") }
maven { url = uri("https://s01.oss.sonatype.org/content/repositories/snapshots") }
}
}

Expand Down

0 comments on commit 4fdda1b

Please sign in to comment.