Skip to content

Commit 78ca8bf

Browse files
authored
Merge pull request #32 from KalebKE/v1.2.3
v1.2.3
2 parents a6df9b0 + ba3d3b7 commit 78ca8bf

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
google()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.2.1'
9+
classpath 'com.android.tools.build:gradle:3.5.3'
1010
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
1111
}
1212
}

fsensor/build.gradle

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

66
android {
7-
compileSdkVersion 28
8-
buildToolsVersion '28.0.3'
7+
compileSdkVersion 29
8+
buildToolsVersion "29.0.3"
99

1010
lintOptions {
1111
abortOnError false
1212
}
1313

1414
defaultConfig {
1515
minSdkVersion 14
16-
targetSdkVersion 28
17-
versionCode 6
18-
versionName "1.2.1"
16+
targetSdkVersion 29
17+
versionCode 8
18+
versionName "1.2.3"
1919

2020
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
2121

@@ -40,5 +40,5 @@ dependencies {
4040
api files('libs/commons-math3-3.6.1.jar')
4141

4242
api 'io.reactivex.rxjava2:rxandroid:2.1.0'
43-
api 'io.reactivex.rxjava2:rxjava:2.x.x'
43+
api 'io.reactivex.rxjava2:rxjava:2.2.2'
4444
}
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Sun Oct 28 11:42:27 MDT 2018
1+
#Sun Mar 29 10:44:22 MDT 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-4.6-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

0 commit comments

Comments
 (0)