File tree 9 files changed +28
-20
lines changed
src/main/java/com/github/pwittchen/reactivesensors/app
src/main/java/com/github/pwittchen/reactivesensors/library
9 files changed +28
-20
lines changed Original file line number Diff line number Diff line change @@ -32,5 +32,5 @@ android {
32
32
33
33
dependencies {
34
34
implementation project(' :library' )
35
- implementation deps. appcompatv7
35
+ implementation deps. appcompat
36
36
}
Original file line number Diff line number Diff line change 17
17
18
18
import android .content .Intent ;
19
19
import android .os .Bundle ;
20
- import android .support .v7 .app .AppCompatActivity ;
21
- import android .view .View ;
20
+ import androidx .appcompat .app .AppCompatActivity ;
22
21
import com .github .pwittchen .reactivesensors .R ;
23
- import com .github .pwittchen .reactivesensors .app .samples .*;
22
+ import com .github .pwittchen .reactivesensors .app .samples .AccelerometerActivity ;
23
+ import com .github .pwittchen .reactivesensors .app .samples .AmbientTemperatureActivity ;
24
+ import com .github .pwittchen .reactivesensors .app .samples .GravityActivity ;
25
+ import com .github .pwittchen .reactivesensors .app .samples .GyroscopeActivity ;
26
+ import com .github .pwittchen .reactivesensors .app .samples .LightActivity ;
27
+ import com .github .pwittchen .reactivesensors .app .samples .LinearAccelerationActivity ;
28
+ import com .github .pwittchen .reactivesensors .app .samples .MagneticFieldActivity ;
29
+ import com .github .pwittchen .reactivesensors .app .samples .OrientationActivity ;
30
+ import com .github .pwittchen .reactivesensors .app .samples .PressureActivity ;
31
+ import com .github .pwittchen .reactivesensors .app .samples .ProximityActivity ;
32
+ import com .github .pwittchen .reactivesensors .app .samples .RelativeHumidityActivity ;
33
+ import com .github .pwittchen .reactivesensors .app .samples .RotationVectorActivity ;
34
+ import com .github .pwittchen .reactivesensors .app .samples .TemperatureActivity ;
24
35
25
36
public class MainActivity extends AppCompatActivity {
26
37
Original file line number Diff line number Diff line change 1
1
package com .github .pwittchen .reactivesensors .app ;
2
2
3
3
import android .os .Bundle ;
4
- import android .support .v7 .app .AppCompatActivity ;
5
4
import android .widget .TextView ;
5
+ import androidx .appcompat .app .AppCompatActivity ;
6
6
import com .github .pwittchen .reactivesensors .R ;
7
7
import com .github .pwittchen .reactivesensors .library .ReactiveSensors ;
8
8
import io .reactivex .rxjava3 .disposables .Disposable ;
Original file line number Diff line number Diff line change 7
7
compileSdkVersion = 29
8
8
targetSdkVersion = 29
9
9
buildToolsVersion = " 29.0.3"
10
- kotlinVersion = " 1.4.0 "
10
+ kotlinVersion = " 1.4.2 "
11
11
}
12
12
13
- ext. deps = [rxjava : ' io.reactivex.rxjava3:rxjava:3.0.7' ,
14
- rxandroid : ' io.reactivex.rxjava3:rxandroid:3.0.0' ,
15
- supportannotations : ' com.android.support:support-annotations:28.0.0' ,
16
- appcompatv7 : ' com.android.support:appcompat-v7:28.0.0' ,
17
- testingsupportlib : ' com.android.support.test:testing-support-lib:0.1' ,
18
- truth : ' com.google.truth:truth:1.0.1' ,
13
+ ext. deps = [rxjava : ' io.reactivex.rxjava3:rxjava:3.1.6' ,
14
+ rxandroid : ' io.reactivex.rxjava3:rxandroid:3.0.2' ,
15
+ appcompat : ' androidx.appcompat:appcompat:1.3.1' , // NOTE: newer versions may cause build errors!
16
+ annotation : ' androidx.annotation:annotation:1.6.0' ,
17
+ truth : ' com.google.truth:truth:1.1.3' ,
19
18
kotlinstdlib : " org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion " ,
20
19
kotlingradleplugin : " org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion " ]
21
20
22
21
buildscript {
23
22
repositories {
24
- jcenter()
25
23
google()
26
24
mavenCentral()
27
25
maven {
@@ -39,7 +37,6 @@ buildscript {
39
37
40
38
allprojects {
41
39
repositories {
42
- jcenter()
43
40
google()
44
41
mavenCentral()
45
42
maven {
Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ apply plugin: 'pmd'
5
5
check. dependsOn ' checkstyle' , ' pmd' , ' lint'
6
6
7
7
checkstyle {
8
- toolVersion = " 6.0 "
8
+ toolVersion = " 6.2 "
9
9
}
10
10
11
11
task checkstyle (type : Checkstyle ) {
Original file line number Diff line number Diff line change 109
109
<!-- <module name="InnerAssignment"/>-->
110
110
<!-- module name="MagicNumber"/-->
111
111
<module name =" MissingSwitchDefault" />
112
- <module name =" RedundantThrows" />
113
112
<module name =" SimplifyBooleanExpression" />
114
113
<module name =" SimplifyBooleanReturn" />
115
114
Original file line number Diff line number Diff line change @@ -14,4 +14,5 @@ POM_DEVELOPER_ID=pwittchen
14
14
POM_DEVELOPER_NAME =Piotr Wittchen
15
15
16
16
org.gradle.daemon =true
17
- org.gradle.jvmargs =-XX:MaxPermSize =1024m -XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m -XX:MaxHeapSize =3048
17
+ org.gradle.jvmargs =-XX:MaxPermSize =1024m -XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx4608m -XX:MaxHeapSize =3048
18
+ android.useAndroidX =true
Original file line number Diff line number Diff line change @@ -36,9 +36,9 @@ android {
36
36
dependencies {
37
37
api deps. rxjava
38
38
api deps. rxandroid
39
- implementation deps. supportannotations
39
+ api deps. annotation
40
40
41
- androidTestImplementation deps . testingsupportlib
41
+ androidTestImplementation project( path : ' :library ' )
42
42
androidTestImplementation(deps. truth) {
43
43
exclude group : ' junit' // Android has JUnit built in
44
44
}
Original file line number Diff line number Diff line change 18
18
import android .hardware .Sensor ;
19
19
import android .hardware .SensorEvent ;
20
20
import android .os .Build ;
21
- import android . support .annotation .RequiresApi ;
21
+ import androidx .annotation .RequiresApi ;
22
22
23
23
public class ReactiveSensorEvent {
24
24
private SensorEvent sensorEvent ;
You can’t perform that action at this time.
0 commit comments