Move base manifest contents into defaultRes manifest

defaultRes/AndroidManifest.xml

@@ -1 +1,14 @@
-<manifest package="eu.kanade.tachiyomi.extension.defaultres" />
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="eu.kanade.tachiyomi.extension">
+
+    <uses-feature android:name="tachiyomi.extension" />
+
+    <application android:icon="@mipmap/ic_launcher" android:allowBackup="false" android:label="${appName}">
+
+        <meta-data android:name="tachiyomi.extension.class" android:value="${extClass}" />
+        <meta-data android:name="tachiyomi.extension.nsfw" android:value="${nsfw}" />
+
+    </application>
+
+</manifest>

src/AndroidManifest.xml

@@ -1,14 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest package="eu.kanade.tachiyomi.extension" />
-    package="eu.kanade.tachiyomi.extension">
-
-    <uses-feature android:name="tachiyomi.extension" />
-
-    <application android:icon="@mipmap/ic_launcher" android:allowBackup="false" android:label="${appName}">
-
-        <meta-data android:name="tachiyomi.extension.class" android:value="${extClass}" />
-        <meta-data android:name="tachiyomi.extension.nsfw" android:value="${nsfw}" />
-
-    </application>
-
-</manifest>

src/zh/jinmantiantang/src/eu/kanade/tachiyomi/extension/zh/jinmantiantang/Jinmantiantang.kt

@@ -153,7 +153,6 @@ class Jinmantiantang : ParsedHttpSource() {
         return GET(url.toString(), headers)
     }
 
-
     override fun searchMangaNextPageSelector(): String? = popularMangaNextPageSelector()
     override fun searchMangaSelector(): String = popularMangaSelector()
     override fun searchMangaFromElement(element: Element): SManga = popularMangaFromElement(element)