Merge ratelimit/urlhandler libs, set okhttp as compileOnly (#1130)

lib/extension-lib/build.gradle

@@ -25,4 +25,5 @@ repositories {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compileOnly 'com.squareup.okhttp3:okhttp:3.10.0'
 }

lib/extension-lib/src/main/AndroidManifest.xml

@@ -1,3 +1,3 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="eu.kanade.tachiyomi.lib.ratelimit">
+    package="eu.kanade.tachiyomi.lib">
 </manifest>

lib/ratelimit/build.gradle

@@ -1,29 +0,0 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-
-android {
-    compileSdkVersion 27
-    buildToolsVersion '28.0.3'
-
-    defaultConfig {
-        minSdkVersion 16
-        targetSdkVersion 27
-        versionCode 1
-        versionName '1.0.0'
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-        }
-    }
-}
-
-repositories {
-    mavenCentral()
-}
-
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'com.squareup.okhttp3:okhttp:3.10.0'
-}

lib/urlhandler/src/main/AndroidManifest.xml

@@ -1,3 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="eu.kanade.tachiyomi.lib.urlhandler">
-</manifest>

settings.gradle

@@ -5,11 +5,12 @@ new File(rootDir, "src").eachDir { dir ->
         project(name).projectDir = new File("src/${dir.name}/${subdir.name}")
     }
 }
+
+include ':extension-lib'
+project(':extension-lib').projectDir = new File("lib/extension-lib")
+
 include ':duktape-stub'
-include ':preference-stub'
-include ':lib-ratelimit'
-include ':lib-urlhandler'
 project(':duktape-stub').projectDir = new File("lib/duktape-stub")
+
+include ':preference-stub'
 project(':preference-stub').projectDir = new File("lib/preference-stub")
-project(':lib-ratelimit').projectDir = new File("lib/ratelimit")
-project(':lib-urlhandler').projectDir = new File("lib/urlhandler")

src/all/mangadex/build.gradle

@@ -5,13 +5,12 @@ ext {
     appName = 'Tachiyomi: MangaDex'
     pkgNameSuffix = 'all.mangadex'
     extClass = '.MangadexFactory'
-    extVersionCode = 58
+    extVersionCode = 59
     libVersion = '1.2'
 }
 
 dependencies {
-    implementation project(':lib-ratelimit')
-    implementation project(':lib-urlhandler')
+    implementation project(':extension-lib')
     compileOnly project(':preference-stub')
     compileOnly 'com.google.code.gson:gson:2.8.2'
     compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0'

src/all/nhentai/build.gradle

@@ -5,12 +5,12 @@ ext {
     appName = 'Tachiyomi: NHentai'
     pkgNameSuffix = 'all.nhentai'
     extClass = '.NHEnglish; .NHJapanese; .NHChinese'
-    extVersionCode = 11
+    extVersionCode = 12
     libVersion = '1.2'
 }
 
 dependencies {
-    implementation project(':lib-urlhandler')
+    implementation project(':extension-lib')
 }
 
 apply from: "$rootDir/common.gradle"

src/ru/mintmanga/build.gradle

@@ -5,12 +5,12 @@ ext {
     appName = 'Tachiyomi: Mintmanga'
     pkgNameSuffix = 'ru.mintmanga'
     extClass = '.Mintmanga'
-    extVersionCode = 10
+    extVersionCode = 11
     libVersion = '1.2'
 }
 
 dependencies {
-    implementation project(':lib-ratelimit')
+    implementation project(':extension-lib')
 }
 
 apply from: "$rootDir/common.gradle"

src/ru/readmanga/build.gradle

@@ -5,12 +5,12 @@ ext {
     appName = 'Tachiyomi: Readmanga'
     pkgNameSuffix = 'ru.readmanga'
     extClass = '.Readmanga'
-    extVersionCode = 10
+    extVersionCode = 11
     libVersion = '1.2'
 }
 
 dependencies {
-    implementation project(':lib-ratelimit')
+    implementation project(':extension-lib')
 }
 
 apply from: "$rootDir/common.gradle"