diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..61a9130 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 37a7509..d5d35ec 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + diff --git a/app/build.gradle b/app/build.gradle index aa9785d..5ee600d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,3 +1,8 @@ +plugins { + id 'com.android.application' + id 'androidx.navigation.safeargs' +} + Properties properties = new Properties() def propertiesFile = project.rootProject.file('local.properties') if (propertiesFile.exists()) { @@ -9,9 +14,6 @@ def appCenterSecret = appCenterLocalSecret != null ? appCenterLocalSecret : appC def appCenterSdkVersion = '3.3.0' def nav_version = "2.3.0" -apply plugin: 'com.android.application' -apply plugin: "androidx.navigation.safeargs" - android { compileSdkVersion 30 buildToolsVersion '30.0.2' @@ -25,6 +27,12 @@ android { buildConfigField "String", "APPCENTER_SECRET", "\"${appCenterSecret}\"" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + + javaCompileOptions { + annotationProcessorOptions { + arguments += ["room.schemaLocation": "$projectDir/schemas".toString()] + } + } } buildTypes { @@ -43,6 +51,10 @@ android { proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } } dependencies { @@ -51,7 +63,7 @@ dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) implementation 'androidx.appcompat:appcompat:1.2.0' - implementation 'com.google.android.material:material:1.2.0' + implementation 'com.google.android.material:material:1.3.0' implementation 'androidx.constraintlayout:constraintlayout:2.0.1' implementation "androidx.navigation:navigation-fragment:$nav_version" implementation "androidx.navigation:navigation-ui:$nav_version" @@ -61,4 +73,18 @@ dependencies { androidTestImplementation 'androidx.test.ext:junit:1.1.2' androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' + def room_version = "2.3.0-rc01" + def rxjava_version = "3.0.0" + + implementation "io.reactivex.rxjava3:rxjava:$rxjava_version" + implementation "io.reactivex.rxjava3:rxandroid:$rxjava_version" + implementation "androidx.room:room-runtime:$room_version" + annotationProcessor "androidx.room:room-compiler:$room_version" + + // optional - RxJava3 support for Room + implementation "androidx.room:room-rxjava3:$room_version" + + // optional - Test helpers + //testImplementation "androidx.room:room-testing:$room_version" + } \ No newline at end of file diff --git a/build.gradle b/build.gradle index ff5deb3..aa51d56 100644 --- a/build.gradle +++ b/build.gradle @@ -19,6 +19,8 @@ allprojects { repositories { google() jcenter() + // maven { url "https://oss.jfrog.org/libs-snapshot" } + // maven { url 'http://repo1.maven.org/maven2' } } }