diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 00000000..d9ce658a
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1 @@
+* @aferditamuriqi
diff --git a/build.gradle b/build.gradle
index 7d71d5c7..e7abc85e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,15 +1,14 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
- ext.kotlin_version = '1.3.31'
- ext.r2branch = 'develop'
+ ext.kotlin_version = '1.3.61'
repositories {
google()
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.4.1'
+ classpath 'com.android.tools.build:gradle:3.5.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
// NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 594dceb0..29f13391 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
diff --git a/r2-navigator/build.gradle b/r2-navigator/build.gradle
index 4810f3db..76fc3bc7 100644
--- a/r2-navigator/build.gradle
+++ b/r2-navigator/build.gradle
@@ -14,15 +14,16 @@ apply plugin: 'com.github.dcendents.android-maven'
group='com.github.readium'
android {
- flavorDimensions "testapp"
- compileSdkVersion 28
+ compileSdkVersion 29
defaultConfig {
minSdkVersion 21
- targetSdkVersion 28
-
+ targetSdkVersion 29
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-
+ }
+ compileOptions {
+ sourceCompatibility 1.8
+ targetCompatibility 1.8
}
buildTypes {
release {
@@ -30,23 +31,6 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
- productFlavors {
- intTestapp {
- dimension "testapp"
- }
- intTestappWithLcp {
- dimension "testapp"
- }
- devTestapp {
- dimension "testapp"
- }
- devTestappWithLcp {
- dimension "testapp"
- }
- }
-
- // default build flavour
- defaultPublishConfig "intTestappDebug"
}
dependencies {
@@ -56,28 +40,28 @@ dependencies {
if (findProject(':r2-shared')) {
implementation project(':r2-shared')
} else {
- implementation "com.github.readium:r2-shared-kotlin:1.0.10"
+ implementation "com.github.readium:r2-shared-kotlin:1.1.6"
}
- implementation "androidx.appcompat:appcompat:1.1.0-beta01"
+ implementation "androidx.appcompat:appcompat:1.2.0-alpha01"
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
- implementation 'androidx.webkit:webkit:1.0.0'
+ implementation 'androidx.webkit:webkit:1.1.0'
implementation "androidx.legacy:legacy-support-v4:1.0.0"
- implementation "com.google.android.material:material:1.1.0-alpha07"
- implementation "androidx.recyclerview:recyclerview:1.1.0-alpha06"
+ implementation "com.google.android.material:material:1.2.0-alpha03"
+ implementation "androidx.recyclerview:recyclerview:1.1.0"
implementation 'joda-time:joda-time:2.9.9'
implementation "androidx.legacy:legacy-support-core-ui:1.0.0"
implementation 'com.duolingo.open:rtl-viewpager:1.0.3'
- implementation 'androidx.viewpager2:viewpager2:1.0.0-alpha05'
+ implementation 'androidx.viewpager2:viewpager2:1.0.0'
implementation 'com.jakewharton.timber:timber:4.7.1'
- implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.1'
+ implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.2.1'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.1.1'
- implementation 'org.zeroturnaround:zt-zip:1.12'
+ implementation 'org.zeroturnaround:zt-zip:1.13'
- implementation 'org.jsoup:jsoup:1.11.2'
+ implementation 'org.jsoup:jsoup:1.10.3'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test:runner:1.2.0'
diff --git a/r2-navigator/r2-navigator.iml b/r2-navigator/r2-navigator.iml
deleted file mode 100644
index 96d610ed..00000000
--- a/r2-navigator/r2-navigator.iml
+++ /dev/null
@@ -1,267 +0,0 @@
-
-