Skip to content

Commit 00915a6

Browse files
committed
Upgrade sample app to Kotlin 1.6.10 and ensure it builds on CI
1 parent 897934e commit 00915a6

File tree

5 files changed

+35
-4
lines changed

5 files changed

+35
-4
lines changed

.github/workflows/sample_app.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# This workflow will build the sample app and ensure that all functionality works.
2+
3+
name: Build sample app
4+
5+
on:
6+
push:
7+
branches: [ main ]
8+
pull_request:
9+
branches: [ main ]
10+
11+
jobs:
12+
sample-app:
13+
runs-on: ubuntu-latest
14+
timeout-minutes: 30
15+
16+
steps:
17+
- name: Checkout
18+
uses: actions/checkout@v2
19+
- name: Set up our JDK environment
20+
uses: actions/setup-java@v1.4.3
21+
with:
22+
java-version: 1.8
23+
- name: Build sample
24+
run: |
25+
./gradlew :affectedmoduledetector:publishToMavenLocal
26+
cd sample
27+
./gradlew build
28+

affectedmoduledetector/src/test/kotlin/com/dropbox/affectedmoduledetector/AffectedModuleDetectorIntegrationTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class AffectedModuleDetectorIntegrationTest {
6060
| }
6161
| dependencies {
6262
| classpath "com.android.tools.build:gradle:4.1.0"
63-
| classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.10"
63+
| classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10"
6464
| }
6565
|}
6666
|plugins {

sample/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import com.dropbox.sample.Dependencies
44
buildscript {
55
repositories {
66
google()
7+
mavenCentral()
78
maven {
89
url "https://plugins.gradle.org/m2/"
910
}
@@ -36,6 +37,7 @@ affectedModuleDetector {
3637
allprojects {
3738
repositories {
3839
google()
40+
mavenCentral()
3941
}
4042
}
4143

sample/buildSrc/build.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,18 @@
22
* Copyright (c) 2020, Dropbox, Inc. All rights reserved.
33
*/
44
plugins {
5-
kotlin("jvm") version "1.4.10"
5+
kotlin("jvm") version "1.6.10"
66
`java-gradle-plugin`
77
}
88

99
repositories {
1010
google()
11+
mavenCentral()
1112
mavenLocal()
1213
}
1314

1415
dependencies {
15-
implementation("com.dropbox.affectedmoduledetector:affectedmoduledetector:0.1.2-SNAPSHOT")
16+
implementation("com.dropbox.affectedmoduledetector:affectedmoduledetector:0.1.4-SNAPSHOT")
1617
testImplementation("junit:junit:4.13.1")
1718
testImplementation("com.nhaarman:mockito-kotlin:1.5.0")
1819
testImplementation("com.google.truth:truth:1.0.1")

sample/buildSrc/src/main/kotlin/com/dropbox/sample/Dependencies.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package com.dropbox.sample
22

33
object Dependencies {
44
private object Versions {
5-
const val KOTLIN_VERSION = "1.4.10"
5+
const val KOTLIN_VERSION = "1.6.10"
66
}
77

88
object Libs {

0 commit comments

Comments
 (0)