diff --git a/SensorLib/app/src/main/java/de/fau/sensorlibtest/RxMainActivity.java b/SensorLib/app/src/main/java/de/fau/sensorlibtest/RxMainActivity.java index 0da26ecd..3160a4e9 100644 --- a/SensorLib/app/src/main/java/de/fau/sensorlibtest/RxMainActivity.java +++ b/SensorLib/app/src/main/java/de/fau/sensorlibtest/RxMainActivity.java @@ -11,7 +11,7 @@ import android.app.Activity; import android.graphics.Color; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.util.Log; import com.androidplot.xy.LineAndPointFormatter; diff --git a/SensorLib/rxsensorlib/build.gradle b/SensorLib/rxsensorlib/build.gradle index 95cba9b2..5667010f 100644 --- a/SensorLib/rxsensorlib/build.gradle +++ b/SensorLib/rxsensorlib/build.gradle @@ -15,7 +15,7 @@ android { versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -33,9 +33,9 @@ dependencies { api 'io.reactivex.rxjava2:rxandroid:2.1.0' api 'io.reactivex.rxjava2:rxjava:2.2.6' - implementation 'com.android.support:appcompat-v7:27.1.1' + implementation 'androidx.appcompat:appcompat:1.0.0' testImplementation 'junit:junit:4.12' - androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + androidTestImplementation 'androidx.test:runner:1.1.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0' api project(path: ':sensorlib') } diff --git a/SensorLib/rxsensorlib/src/androidTest/java/de/fau/sensorlib/rx/ExampleInstrumentedTest.java b/SensorLib/rxsensorlib/src/androidTest/java/de/fau/sensorlib/rx/ExampleInstrumentedTest.java index 2568659f..840d227c 100644 --- a/SensorLib/rxsensorlib/src/androidTest/java/de/fau/sensorlib/rx/ExampleInstrumentedTest.java +++ b/SensorLib/rxsensorlib/src/androidTest/java/de/fau/sensorlib/rx/ExampleInstrumentedTest.java @@ -1,8 +1,8 @@ package de.fau.sensorlib.rx; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/SensorLib/sensorlib/build.gradle b/SensorLib/sensorlib/build.gradle index 62e28904..100c99ca 100644 --- a/SensorLib/sensorlib/build.gradle +++ b/SensorLib/sensorlib/build.gradle @@ -82,10 +82,10 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation 'org.apache.commons:commons-lang3:3.0' - api 'com.android.support:appcompat-v7:27.1.1' - implementation 'com.android.support:recyclerview-v7:27.1.1' - implementation 'com.android.support:cardview-v7:27.1.1' - implementation 'com.android.support:design:27.1.1' + api 'androidx.appcompat:appcompat:1.0.0' + implementation 'androidx.recyclerview:recyclerview:1.0.0' + implementation 'androidx.cardview:cardview:1.0.0' + implementation 'com.google.android.material:material:1.0.0' implementation 'com.github.hannesa2:MPAndroidChart:3.0.6' } diff --git a/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/BleScanCallback.java b/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/BleScanCallback.java index f8362e3d..6cf61041 100644 --- a/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/BleScanCallback.java +++ b/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/BleScanCallback.java @@ -9,7 +9,7 @@ import android.bluetooth.le.ScanCallback; import android.bluetooth.le.ScanResult; -import android.support.annotation.CallSuper; +import androidx.annotation.CallSuper; import android.util.Log; import android.util.SparseArray; diff --git a/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/BleSensorManager.java b/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/BleSensorManager.java index e731a82f..5449362f 100644 --- a/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/BleSensorManager.java +++ b/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/BleSensorManager.java @@ -20,8 +20,8 @@ import android.os.Build; import android.os.Handler; import android.os.ParcelUuid; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.ContextCompat; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; import android.util.Log; import java.util.ArrayList; diff --git a/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/SensorDataRecorder.java b/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/SensorDataRecorder.java index 92b84a14..8e904b97 100644 --- a/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/SensorDataRecorder.java +++ b/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/SensorDataRecorder.java @@ -4,7 +4,7 @@ import android.content.Context; import android.content.pm.PackageManager; import android.os.Environment; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import android.util.Log; import android.widget.Toast; diff --git a/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/sensors/AbstractSensor.java b/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/sensors/AbstractSensor.java index 161e9709..592324a9 100644 --- a/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/sensors/AbstractSensor.java +++ b/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/sensors/AbstractSensor.java @@ -10,7 +10,7 @@ import android.content.Context; import android.os.Handler; import android.os.Message; -import android.support.annotation.CallSuper; +import androidx.annotation.CallSuper; import android.util.Log; import java.util.ArrayList; diff --git a/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/GenericFileProvider.java b/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/GenericFileProvider.java index 91ed754c..f64bdb0b 100644 --- a/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/GenericFileProvider.java +++ b/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/GenericFileProvider.java @@ -8,7 +8,7 @@ package de.fau.sensorlib.widgets; -import android.support.v4.content.FileProvider; +import androidx.core.content.FileProvider; public class GenericFileProvider extends FileProvider { diff --git a/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/RecorderShareDialog.java b/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/RecorderShareDialog.java index 9b3a9176..0f6489f7 100644 --- a/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/RecorderShareDialog.java +++ b/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/RecorderShareDialog.java @@ -12,8 +12,8 @@ import android.content.DialogInterface; import android.content.Intent; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.v7.app.AlertDialog; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; import java.io.File; diff --git a/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/SensorActionDialog.java b/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/SensorActionDialog.java index ac32a052..705f9020 100644 --- a/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/SensorActionDialog.java +++ b/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/SensorActionDialog.java @@ -9,11 +9,11 @@ package de.fau.sensorlib.widgets; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.DialogFragment; -import android.support.v4.app.FragmentActivity; -import android.support.v4.app.FragmentManager; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.FragmentActivity; +import androidx.fragment.app.FragmentManager; import android.util.Log; import android.view.LayoutInflater; import android.view.View; diff --git a/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/SensorInfoBar.java b/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/SensorInfoBar.java index 0d92e564..727b892a 100644 --- a/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/SensorInfoBar.java +++ b/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/SensorInfoBar.java @@ -11,12 +11,12 @@ import android.content.ContextWrapper; import android.graphics.Rect; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.app.FragmentManager; -import android.support.v4.widget.TextViewCompat; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.fragment.app.FragmentManager; +import androidx.core.widget.TextViewCompat; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; @@ -250,4 +250,4 @@ public void getItemOffsets(Rect outRect, View view, RecyclerView parent, State s outRect.set(spacing, spacing, spacing, spacing); } } -} \ No newline at end of file +} diff --git a/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/SensorInfoDialog.java b/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/SensorInfoDialog.java index 6fd43dab..058574ee 100644 --- a/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/SensorInfoDialog.java +++ b/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/SensorInfoDialog.java @@ -1,8 +1,8 @@ package de.fau.sensorlib.widgets; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.DialogFragment; +import androidx.annotation.Nullable; +import androidx.fragment.app.DialogFragment; import android.text.Html; import android.view.LayoutInflater; import android.view.View; diff --git a/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/SensorPickerDialog.java b/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/SensorPickerDialog.java index 2995c19d..cbd8253b 100644 --- a/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/SensorPickerDialog.java +++ b/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/SensorPickerDialog.java @@ -14,16 +14,16 @@ import android.graphics.Typeface; import android.os.Bundle; import android.os.Handler; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.DialogFragment; -import android.support.v4.content.ContextCompat; -import android.support.v4.util.ArraySet; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.RecyclerView.Adapter; -import android.support.v7.widget.RecyclerView.ViewHolder; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.DialogFragment; +import androidx.core.content.ContextCompat; +import androidx.collection.ArraySet; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView.Adapter; +import androidx.recyclerview.widget.RecyclerView.ViewHolder; import android.util.TypedValue; import android.view.LayoutInflater; import android.view.View; diff --git a/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/SensorPlotter.java b/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/SensorPlotter.java index a71624d3..2a0fbb52 100644 --- a/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/SensorPlotter.java +++ b/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/SensorPlotter.java @@ -11,14 +11,14 @@ import android.content.res.TypedArray; import android.graphics.Color; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; -import android.support.v4.graphics.ColorUtils; -import android.support.v7.widget.CardView; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.RecyclerView.ViewHolder; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; +import androidx.core.graphics.ColorUtils; +import androidx.cardview.widget.CardView; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView.ViewHolder; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; diff --git a/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/SimulationPickerFragment.java b/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/SimulationPickerFragment.java index 5737f592..84f835ed 100644 --- a/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/SimulationPickerFragment.java +++ b/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/SimulationPickerFragment.java @@ -5,10 +5,10 @@ import android.content.DialogInterface; import android.os.Bundle; import android.os.Environment; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.DialogFragment; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.DialogFragment; +import androidx.appcompat.app.AppCompatActivity; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -31,7 +31,7 @@ import de.fau.sensorlib.enums.KnownSensor; /** - * {@link android.support.v4.app.DialogFragment} that lists files for simulation. + * {@link DialogFragment} that lists files for simulation. */ public class SimulationPickerFragment extends DialogFragment implements View.OnClickListener { diff --git a/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/StatusBar.java b/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/StatusBar.java index 956a7472..2ea3c190 100644 --- a/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/StatusBar.java +++ b/SensorLib/sensorlib/src/main/java/de/fau/sensorlib/widgets/StatusBar.java @@ -9,7 +9,7 @@ import android.content.Context; import android.content.res.TypedArray; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import android.util.AttributeSet; import android.widget.RelativeLayout; import android.widget.TextView; diff --git a/SensorLib/sensorlib/src/main/res/layout/item_sensor_info_bar.xml b/SensorLib/sensorlib/src/main/res/layout/item_sensor_info_bar.xml index 21dc55bc..730979a5 100644 --- a/SensorLib/sensorlib/src/main/res/layout/item_sensor_info_bar.xml +++ b/SensorLib/sensorlib/src/main/res/layout/item_sensor_info_bar.xml @@ -1,11 +1,11 @@ - + - \ No newline at end of file + diff --git a/SensorLib/sensorlib/src/main/res/layout/item_sensor_picker.xml b/SensorLib/sensorlib/src/main/res/layout/item_sensor_picker.xml index 1a9153f5..970cf249 100644 --- a/SensorLib/sensorlib/src/main/res/layout/item_sensor_picker.xml +++ b/SensorLib/sensorlib/src/main/res/layout/item_sensor_picker.xml @@ -1,11 +1,11 @@ - + - \ No newline at end of file + diff --git a/SensorLib/sensorlib/src/main/res/layout/widget_sensor_picker.xml b/SensorLib/sensorlib/src/main/res/layout/widget_sensor_picker.xml index 0c4e075d..70371979 100644 --- a/SensorLib/sensorlib/src/main/res/layout/widget_sensor_picker.xml +++ b/SensorLib/sensorlib/src/main/res/layout/widget_sensor_picker.xml @@ -30,7 +30,7 @@ - - \ No newline at end of file + diff --git a/SensorLib/sensorlib/src/main/res/layout/widget_sensor_plotter.xml b/SensorLib/sensorlib/src/main/res/layout/widget_sensor_plotter.xml index b934a7b3..74a95dfd 100644 --- a/SensorLib/sensorlib/src/main/res/layout/widget_sensor_plotter.xml +++ b/SensorLib/sensorlib/src/main/res/layout/widget_sensor_plotter.xml @@ -1,11 +1,11 @@ - + - - \ No newline at end of file + diff --git a/SensorLib/sensorlib/src/main/res/layout/widget_streaming_footer.xml b/SensorLib/sensorlib/src/main/res/layout/widget_streaming_footer.xml index 4f605b75..211fec5e 100644 --- a/SensorLib/sensorlib/src/main/res/layout/widget_streaming_footer.xml +++ b/SensorLib/sensorlib/src/main/res/layout/widget_streaming_footer.xml @@ -38,7 +38,7 @@ tools:ignore="ButtonStyle" /> - - \ No newline at end of file + diff --git a/SensorLib/sensorlibutils/build.gradle b/SensorLib/sensorlibutils/build.gradle index 85f01fb2..5b38ff40 100644 --- a/SensorLib/sensorlibutils/build.gradle +++ b/SensorLib/sensorlibutils/build.gradle @@ -23,7 +23,7 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'com.android.support:appcompat-v7:27.1.1' + implementation 'androidx.appcompat:appcompat:1.0.0' } tasks.create(name: 'copyApk', type: Copy) { diff --git a/SensorLib/sls-fitnessshirt/build.gradle b/SensorLib/sls-fitnessshirt/build.gradle index 52166f32..47b40fd4 100644 --- a/SensorLib/sls-fitnessshirt/build.gradle +++ b/SensorLib/sls-fitnessshirt/build.gradle @@ -23,7 +23,7 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation project(path: ':sensorlib') - implementation 'com.android.support:appcompat-v7:27.1.1' + implementation 'androidx.appcompat:appcompat:1.0.0' } tasks.create(name: 'copyApk', type: Copy) { diff --git a/SensorLib/sls-portabiles/build.gradle b/SensorLib/sls-portabiles/build.gradle index 72c0b877..344ec236 100644 --- a/SensorLib/sls-portabiles/build.gradle +++ b/SensorLib/sls-portabiles/build.gradle @@ -22,7 +22,7 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation project(path: ':sensorlib') - implementation 'com.android.support:appcompat-v7:27.1.1' + implementation 'androidx.appcompat:appcompat:1.0.0' implementation 'com.google.code.gson:gson:2.8.5' } diff --git a/SensorLib/sls-portabiles/src/main/java/de/fau/sensorlib/sensors/logging/SessionByteWriter.java b/SensorLib/sls-portabiles/src/main/java/de/fau/sensorlib/sensors/logging/SessionByteWriter.java index d5a5cb7c..24a8e431 100644 --- a/SensorLib/sls-portabiles/src/main/java/de/fau/sensorlib/sensors/logging/SessionByteWriter.java +++ b/SensorLib/sls-portabiles/src/main/java/de/fau/sensorlib/sensors/logging/SessionByteWriter.java @@ -12,7 +12,7 @@ import android.content.Context; import android.content.pm.PackageManager; import android.os.Environment; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import android.util.Log; import android.widget.Toast; diff --git a/SensorLib/sls-portabiles/src/main/java/de/fau/sensorlib/sensors/logging/SessionDownloadChecker.java b/SensorLib/sls-portabiles/src/main/java/de/fau/sensorlib/sensors/logging/SessionDownloadChecker.java index 81dfd0de..65b7cf63 100644 --- a/SensorLib/sls-portabiles/src/main/java/de/fau/sensorlib/sensors/logging/SessionDownloadChecker.java +++ b/SensorLib/sls-portabiles/src/main/java/de/fau/sensorlib/sensors/logging/SessionDownloadChecker.java @@ -12,7 +12,7 @@ import android.content.Context; import android.content.pm.PackageManager; import android.os.Environment; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import android.util.Log; import android.widget.Toast; diff --git a/SensorLib/sls-shimmer/build.gradle b/SensorLib/sls-shimmer/build.gradle index d5b89332..55ae02e8 100644 --- a/SensorLib/sls-shimmer/build.gradle +++ b/SensorLib/sls-shimmer/build.gradle @@ -23,7 +23,7 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation project(path: ':sensorlib') - implementation 'com.android.support:appcompat-v7:27.1.1' + implementation 'androidx.appcompat:appcompat:1.0.0' implementation 'com.google.guava:guava:22.0' implementation 'org.apache.commons:commons-math:2.2' diff --git a/SensorLib/sls-shimmer/src/main/java/de/fau/sensorlib/sensors/ShimmerSensor.java b/SensorLib/sls-shimmer/src/main/java/de/fau/sensorlib/sensors/ShimmerSensor.java index 71b7e9e5..968de435 100644 --- a/SensorLib/sls-shimmer/src/main/java/de/fau/sensorlib/sensors/ShimmerSensor.java +++ b/SensorLib/sls-shimmer/src/main/java/de/fau/sensorlib/sensors/ShimmerSensor.java @@ -11,7 +11,7 @@ import android.content.Context; import android.os.Handler; import android.os.Message; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.Log; import com.shimmerresearch.driver.FormatCluster; diff --git a/SensorLib/sls-simblee/build.gradle b/SensorLib/sls-simblee/build.gradle index 8fb8a782..89dac964 100644 --- a/SensorLib/sls-simblee/build.gradle +++ b/SensorLib/sls-simblee/build.gradle @@ -24,7 +24,7 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation project(path: ':sensorlib') - implementation 'com.android.support:appcompat-v7:27.1.1' + implementation 'androidx.appcompat:appcompat:1.0.0' } diff --git a/SensorLib/sls-smartband2/build.gradle b/SensorLib/sls-smartband2/build.gradle index 04bbf6a9..a0d3a2fc 100644 --- a/SensorLib/sls-smartband2/build.gradle +++ b/SensorLib/sls-smartband2/build.gradle @@ -25,7 +25,7 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation project(path: ':sensorlib') - implementation 'com.android.support:appcompat-v7:27.1.1' + implementation 'androidx.appcompat:appcompat:1.0.0' } diff --git a/SensorLib/sls-smartwatch/build.gradle b/SensorLib/sls-smartwatch/build.gradle index a37410d7..fadfcc26 100644 --- a/SensorLib/sls-smartwatch/build.gradle +++ b/SensorLib/sls-smartwatch/build.gradle @@ -24,7 +24,7 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation project(path: ':sensorlib') - implementation 'com.android.support:appcompat-v7:27.1.1' + implementation 'androidx.appcompat:appcompat:1.0.0' implementation 'com.google.android.gms:play-services-wearable:15.0.1' } diff --git a/SensorLib/sls-tek/build.gradle b/SensorLib/sls-tek/build.gradle index aa47fca2..219eb1c0 100644 --- a/SensorLib/sls-tek/build.gradle +++ b/SensorLib/sls-tek/build.gradle @@ -25,7 +25,7 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation project(path: ':sensorlib') - implementation 'com.android.support:appcompat-v7:27.1.1' + implementation 'androidx.appcompat:appcompat:1.0.0' } tasks.create(name: 'copyApk', type: Copy) {