Skip to content

Commit

Permalink
Merge branch 'dev' into central-master
Browse files Browse the repository at this point in the history
  • Loading branch information
@RobbWatershed
RobbWatershed committed May 23, 2021
2 parents f90f73f + 1369d6a commit 94a7e92
Show file tree
Hide file tree
Showing 235 changed files with 9,084 additions and 2,369 deletions.
63 changes: 28 additions & 35 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,6 @@ if (file('signing.gradle').exists()) {
apply from: 'signing.gradle'
}

repositories {
exclusiveContent {
forRepository {
maven {
url 'https://dl.bintray.com/omicronapps/7-Zip-JBinding-4Android'
}
}
filter {
includeGroup "net.sf.sevenzipjbinding"
}
}
}

android {
compileSdkVersion 30
compileOptions {
Expand All @@ -31,14 +18,13 @@ android {
kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8
}
buildToolsVersion "29.0.3"
defaultConfig {
applicationId "me.devsaki.hentoid"
minSdkVersion 21
//noinspection ExpiringTargetSdkVersion
targetSdkVersion 30
versionCode 130 // is updated automatically by BitRise; only used when building locally
versionName '1.14.4'
versionName '1.14.5'

def fkToken = '\"' + (System.getenv("FK_TOKEN") ?: "") + '\"'
def includeObjectBoxBrowser = System.getenv("INCLUDE_OBJECTBOX_BROWSER") ?: "false"
Expand Down Expand Up @@ -100,8 +86,8 @@ dependencies {
/**
* TESTING
*/
testImplementation 'junit:junit:4.13.1'
testImplementation 'org.mockito:mockito-core:3.6.28'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.mockito:mockito-core:3.9.0'
testImplementation 'androidx.test:core:1.3.0'
testImplementation 'io.kotlintest:kotlintest-assertions:3.4.2'
testImplementation "androidx.arch.core:core-testing:2.1.0"
Expand All @@ -116,7 +102,7 @@ dependencies {
/**
* ANDROID FRAMEWORK
*/
implementation "org.jetbrains.kotlin:kotlin-stdlib:1.4.31"
implementation "org.jetbrains.kotlin:kotlin-stdlib:1.4.32"

// Support libraries
implementation 'androidx.recyclerview:recyclerview:1.1.0'
Expand All @@ -129,14 +115,16 @@ dependencies {
implementation 'androidx.legacy:legacy-support-v13:1.0.0'
implementation 'com.google.android.gms:play-services-safetynet:17.0.0'
implementation 'androidx.paging:paging-runtime:2.1.2'
implementation "androidx.fragment:fragment-ktx:1.3.1"
implementation 'androidx.fragment:fragment-ktx:1.3.2'
implementation "androidx.documentfile:documentfile:1.0.1"
// <-- if documentfile is bumped, please examine FileExplorer for evolutions
implementation "androidx.viewpager2:viewpager2:1.0.0"
implementation "androidx.work:work-runtime:2.5.0"
def android_work_version = '2.5.0'
implementation "androidx.work:work-runtime:$android_work_version"
implementation "androidx.work:work-runtime-ktx:$android_work_version"

// For ViewModel to work
def android_lifecycle_version = "2.3.0"
def android_lifecycle_version = '2.3.1'
implementation "androidx.lifecycle:lifecycle-viewmodel:$android_lifecycle_version"
implementation "androidx.lifecycle:lifecycle-process:$android_lifecycle_version"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:$android_lifecycle_version"
Expand All @@ -159,7 +147,7 @@ dependencies {
* UI
*/
// https://github.com/mikepenz/FastAdapter
def fastadapter_version = "5.3.5"
def fastadapter_version = '5.4.1'
implementation "com.mikepenz:fastadapter:$fastadapter_version"
implementation "com.mikepenz:fastadapter-extensions-diff:$fastadapter_version"
implementation "com.mikepenz:fastadapter-extensions-swipe:$fastadapter_version"
Expand All @@ -174,7 +162,7 @@ dependencies {
implementation 'com.github.AppIntro:AppIntro:6.0.0'

// Tooltips
implementation 'com.github.skydoves:balloon:1.3.3'
implementation 'com.github.skydoves:balloon:1.3.4'

// Dropdown lists
implementation "com.github.skydoves:powerspinner:1.1.7"
Expand All @@ -183,7 +171,7 @@ dependencies {
implementation 'com.github.skydoves:powermenu:2.1.9'

// Micro menu
implementation "com.github.skydoves:submarine:1.0.5"
implementation "com.github.skydoves:submarine:1.0.7"

// Fast scroller
implementation "me.zhanghai.android.fastscroll:library:1.1.5"
Expand All @@ -195,7 +183,7 @@ dependencies {
* NETWORKING
*/
// Java serialization/deserialization (Java Objects into JSON and back): https://github.com/square/moshi
def moshi_version = '1.11.0'
def moshi_version = '1.12.0'
implementation "com.squareup.moshi:moshi:$moshi_version"
implementation "com.squareup.moshi:moshi-adapters:$moshi_version"

Expand Down Expand Up @@ -229,10 +217,11 @@ dependencies {
// https://github.com/ReactiveX/RxJava
implementation 'io.reactivex.rxjava2:rxjava:2.2.21'
implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
implementation 'io.reactivex.rxjava2:rxkotlin:2.4.0'

// ObjectBox browser dependencies must be set before applying ObjectBox plugin so it does not add objectbox-android
// (would result in two conflicting versions, e.g. "Duplicate files copied in APK lib/armeabi-v7a/libobjectbox.so").
def objectbox_version = "2.8.1"
def objectbox_version = "2.9.1"
if (includeObjectBoxBrowser.toBoolean()) {
debugImplementation "io.objectbox:objectbox-android-objectbrowser:$objectbox_version"
releaseImplementation "io.objectbox:objectbox-android:$objectbox_version"
Expand All @@ -245,7 +234,7 @@ dependencies {
implementation 'org.greenrobot:eventbus:3.2.0'

// Lightweight Stream : github.com/aNNiMON/Lightweight-Stream-API
implementation 'com.annimon:stream:1.2.1'
implementation 'com.annimon:stream:1.2.2'

// LeakCanary: github.com/square/leakcanary
if (includeLeakCanary.toBoolean()) {
Expand All @@ -256,33 +245,36 @@ dependencies {
implementation 'commons-io:commons-io:2.6'

// https://mvnrepository.com/artifact/org.apache.commons/commons-lang3
implementation 'org.apache.commons:commons-lang3:3.11'
implementation 'org.apache.commons:commons-lang3:3.12.0'

// https://mvnrepository.com/artifact/org.apache.commons/commons-text/
implementation 'org.apache.commons:commons-text:1.4'
// !!! Don't update that one or Lint will go mad
implementation 'org.apache.commons:commons-text:1.9'

// Cleaner date manipulation
implementation 'com.jakewharton.threetenabp:threetenabp:1.2.1'
implementation 'com.jakewharton.threetenabp:threetenabp:1.3.0'

// Archive management
implementation 'net.sf.sevenzipjbinding:sevenzipjbinding:16.02-2.01'
implementation 'com.github.omicronapps:7-Zip-JBinding-4Android:Release-16.02-2.02'

// Natural strings comparator
implementation 'net.grey-panther:natural-comparator:1.1'

// Efficient hashing
implementation 'io.whitfin:siphash:2.0.0'

// Sentence similarity detection
implementation 'info.debatty:java-string-similarity:2.0.0'


/**
* ANALYTICS
*/
// Firebase
implementation 'com.google.firebase:firebase-analytics:18.0.2'
// Import the BoM for the Firebase platform
implementation platform('com.google.firebase:firebase-bom:27.1.0')

// Crashlytics
implementation 'com.google.firebase:firebase-crashlytics:17.4.0'
implementation 'com.google.firebase:firebase-crashlytics'
implementation 'com.google.firebase:firebase-analytics'


implementation project(path: ':app:customssiv')
Expand All @@ -295,6 +287,7 @@ sonarqube {
property "sonar.host.url", "https://sonarcloud.io"
property "sonar.language", "java"
property "sonar.sources", "src/main/"
property "sonar.sourceEncoding", "UTF-8"
property "sonar.login", "3d0dc80792bad95f0193e7ed626cf090ac83e208"
}
}
Expand Down
5 changes: 2 additions & 3 deletions app/customssiv/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_1_8
}
buildToolsVersion "29.0.3"

defaultConfig {
minSdkVersion 21
Expand Down Expand Up @@ -42,9 +41,9 @@ dependencies {
implementation 'com.jakewharton.timber:timber:4.7.1'

// https://github.com/ReactiveX/RxJava
implementation 'io.reactivex.rxjava2:rxjava:2.2.20'
implementation 'io.reactivex.rxjava2:rxjava:2.2.21'
implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'

// https://mvnrepository.com/artifact/org.apache.commons/commons-lang3
implementation 'org.apache.commons:commons-lang3:3.11'
implementation 'org.apache.commons:commons-lang3:3.12.0'
}
78 changes: 74 additions & 4 deletions app/objectbox-models/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
},
{
"id": "2:5880334030341287801",
"lastPropertyId": "25:515620137730542700",
"lastPropertyId": "26:72694651852852193",
"name": "Content",
"properties": [
{
Expand Down Expand Up @@ -181,6 +181,12 @@
"name": "readProgress",
"type": 7,
"flags": 4
},
{
"id": "26:72694651852852193",
"name": "completed",
"type": 1,
"flags": 4
}
],
"relations": [
Expand All @@ -193,7 +199,7 @@
},
{
"id": "3:2849837771881495731",
"lastPropertyId": "14:2962440896788849680",
"lastPropertyId": "15:5135092662762413378",
"name": "ImageFile",
"properties": [
{
Expand Down Expand Up @@ -270,6 +276,12 @@
"name": "read",
"type": 1,
"flags": 4
},
{
"id": "15:5135092662762413378",
"name": "imageHash",
"type": 6,
"flags": 4
}
],
"relations": []
Expand Down Expand Up @@ -561,9 +573,65 @@
}
],
"relations": []
},
{
"id": "13:7937878460553138785",
"lastPropertyId": "10:4636705001081237914",
"name": "DuplicateEntry",
"properties": [
{
"id": "3:2093692672368655834",
"name": "titleScore",
"type": 7,
"flags": 4
},
{
"id": "4:1857179527185107957",
"name": "coverScore",
"type": 7,
"flags": 4
},
{
"id": "5:334967191803969001",
"name": "artistScore",
"type": 7,
"flags": 4
},
{
"id": "6:4769062372712151805",
"name": "id",
"type": 6,
"flags": 1
},
{
"id": "7:1098218792851277018",
"name": "referenceSize",
"type": 6,
"flags": 4
},
{
"id": "8:7706865596199564791",
"name": "referenceId",
"type": 6,
"flags": 4
},
{
"id": "9:1179341344641812936",
"name": "duplicateId",
"type": 6,
"flags": 4
},
{
"id": "10:4636705001081237914",
"name": "duplicateSize",
"type": 6,
"flags": 4
}
],
"relations": []
}
],
"lastEntityId": "12:6339833598022566662",
"lastEntityId": "13:7937878460553138785",
"lastIndexId": "16:2424237144553088526",
"lastRelationId": "3:1412032361666532056",
"lastSequenceId": "0:0",
Expand Down Expand Up @@ -591,7 +659,9 @@
7159239942191071387,
6300283326491520978,
753426778229264571,
2206907103185425670
2206907103185425670,
6457903105882729256,
4015520791093060143
],
"retiredRelationUids": [
4182320255043105081,
Expand Down
Loading

0 comments on commit 94a7e92

Please sign in to comment.