Skip to content

Commit dd57c67

Browse files
Merge pull request #90 from javiersantos/1.2.8
2 parents 2880913 + ddd8ab8 commit dd57c67

File tree

5 files changed

+20
-20
lines changed

5 files changed

+20
-20
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ jdk: oraclejdk8
33

44
env:
55
global:
6-
- ANDROID_API=29
6+
- ANDROID_API=30
77
- ANDROID_BUILD_TOOLS=29.0.3
88
- EMULATOR_API=21
99

app/build.gradle

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 29
4+
compileSdkVersion 30
55
buildToolsVersion "29.0.3"
66

77
defaultConfig {
88
applicationId "com.github.javiersantos.piracychecker.demo"
99
minSdkVersion 14
10-
targetSdkVersion 29
10+
targetSdkVersion 30
1111
versionCode 1
1212
versionName "1.0"
1313
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -39,18 +39,18 @@ dependencies {
3939
implementation project(':library')
4040

4141
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
42-
implementation 'androidx.appcompat:appcompat:1.1.0'
43-
implementation 'com.google.android.material:material:1.1.0'
42+
implementation 'androidx.appcompat:appcompat:1.2.0'
43+
implementation 'com.google.android.material:material:1.2.1'
4444
implementation 'androidx.cardview:cardview:1.0.0'
4545

4646
// Testing-only dependencies
4747
testImplementation 'junit:junit:4.12'
48-
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
49-
androidTestImplementation 'androidx.test:rules:1.2.0'
50-
androidTestImplementation('androidx.test:runner:1.1.0', {
48+
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
49+
androidTestImplementation 'androidx.test:rules:1.3.0'
50+
androidTestImplementation('androidx.test:runner:1.3.0', {
5151
exclude group: 'com.android.support', module: 'support-annotations'
5252
})
53-
androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
53+
androidTestImplementation('androidx.test.espresso:espresso-core:3.3.0', {
5454
exclude group: 'com.android.support', module: 'support-annotations'
5555
})
5656
}

build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.3.71'
4+
ext.kotlin_version = '1.4.10'
55
repositories {
66
jcenter()
77
google()
88
maven { url 'https://jitpack.io' }
99
}
1010
dependencies {
11-
classpath 'com.android.tools.build:gradle:3.6.2'
11+
classpath 'com.android.tools.build:gradle:4.1.0'
1212
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1313
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
1414

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Sep 10 22:40:11 COT 2019
1+
#Sun Nov 08 12:25:50 COT 2020
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip

library/build.gradle

+7-7
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ apply plugin: 'com.github.dcendents.android-maven'
44
group = 'com.github.javiersantos'
55

66
android {
7-
compileSdkVersion 29
7+
compileSdkVersion 30
88
buildToolsVersion "29.0.3"
99

1010
defaultConfig {
1111
minSdkVersion 14
12-
targetSdkVersion 29
13-
versionCode 127
14-
versionName "1.2.7"
12+
targetSdkVersion 30
13+
versionCode 128
14+
versionName "1.2.8"
1515
consumerProguardFiles 'proguard-rules.pro'
1616
}
1717
buildTypes {
@@ -25,9 +25,9 @@ android {
2525

2626
dependencies {
2727
api fileTree(dir: 'libs', include: ['*.jar'])
28-
implementation 'androidx.appcompat:appcompat:1.1.0'
29-
implementation 'androidx.preference:preference:1.1.0'
30-
implementation 'com.google.android.material:material:1.1.0'
28+
implementation 'androidx.appcompat:appcompat:1.2.0'
29+
implementation 'androidx.preference:preference:1.1.1'
30+
implementation 'com.google.android.material:material:1.2.1'
3131
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
3232
}
3333

0 commit comments

Comments
 (0)