diff --git a/app/build.gradle b/app/build.gradle index fdc73b0..2dec70d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 27 + compileSdkVersion 28 defaultConfig { applicationId "net.foucry.pilldroid" minSdkVersion defaultMinSdkVersion @@ -34,22 +34,19 @@ android { } } -/*repositories { - mavenCentral() - maven { - url "https://raw.github.com/embarkmobile/zxing-android-minimal/mvn-repo/maven-repository/" - } -}*/ +repositories { + jcenter() +} dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') testImplementation 'junit:junit:4.13' - implementation 'com.android.support:appcompat-v7:27.1.1' - implementation 'com.android.support:recyclerview-v7:27.1.1' - implementation 'com.android.support:design:27.1.1' - implementation 'com.android.support:support-v4:27.1.1' + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.recyclerview:recyclerview:1.0.0' + implementation 'com.google.android.material:material:1.0.0' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation 'com.google.zxing:core:3.4.0' + implementation 'com.journeyapps:zxing-android-embedded:4.1.0' + implementation 'androidx.appcompat:appcompat:1.1.0' } - diff --git a/app/libs/android-core-3.2.2-SNAPSHOT.jar b/app/libs/android-core-3.2.2-SNAPSHOT.jar deleted file mode 100644 index 503f817..0000000 Binary files a/app/libs/android-core-3.2.2-SNAPSHOT.jar and /dev/null differ diff --git a/app/libs/core-3.2.2-SNAPSHOT.jar b/app/libs/core-3.2.2-SNAPSHOT.jar deleted file mode 100644 index 4ed7e27..0000000 Binary files a/app/libs/core-3.2.2-SNAPSHOT.jar and /dev/null differ diff --git a/gradle.properties b/gradle.properties index 1d3591c..915f0e6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,4 +15,6 @@ # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true \ No newline at end of file +# org.gradle.parallel=true +android.enableJetifier=true +android.useAndroidX=true \ No newline at end of file