Move libraries into the repository

Author: Mishiranu

.gitignore

@@ -9,6 +9,11 @@
 !/gradle
 !/gradlew
 !/gradlew.bat
+!/libraries
+/libraries/*/*
+!/libraries/*/build.gradle
+!/libraries/*/res
+!/libraries/*/src
 !/LICENSE
 !/README.md
 !/settings.gradle

README.md

@@ -1,12 +1,9 @@
 # Dashchan Extensions
 
-This repository is used to store Dashchan extensions source code.
+Extensions and libraries.
 
 Old extensions are placed under their own specific branch. It's planned to move them all into master branch.
 
-General dependencies: [Public API](https://github.com/Mishiranu/Dashchan-Library),
-[Static Library](https://github.com/Mishiranu/Dashchan-Static).
-
 ## Building Guide
 
 1. Install JDK 8 or higher
@@ -15,8 +12,6 @@ General dependencies: [Public API](https://github.com/Mishiranu/Dashchan-Library
 
 The resulting APK file will appear in `extensions/%CHAN_NAME%/build/outputs/apk` directory.
 
-The API library may be updated. In this case, run `gradle --refresh-dependencies assembleRelease`.
-
 ### Build Signed Binary
 
 You can create `keystore.properties` in the source code directory with the following properties:

build.gradle

@@ -26,6 +26,54 @@ class GenerateFileTask extends DefaultTask {
 	}
 }
 
+def configureCommon(project, manifestFile) {
+	project.android {
+		compileSdkVersion 29
+		buildToolsVersion '29.0.3'
+
+		defaultConfig {
+			minSdkVersion 16
+			targetSdkVersion 29
+		}
+
+		sourceSets.main {
+			manifest.srcFile manifestFile
+			java.srcDirs = ['src']
+			resources.srcDirs = []
+			aidl.srcDirs = ['src']
+			renderscript.srcDirs = ['src']
+			res.srcDirs = ['res']
+			assets.srcDirs = ['assets']
+		}
+
+		compileOptions {
+			sourceCompatibility JavaVersion.VERSION_1_8
+			targetCompatibility JavaVersion.VERSION_1_8
+		}
+	}
+}
+
+project.ext.set 'configureLibrary', { project ->
+	def packageName = 'chan.library.' + project.name
+	def xml = '<?xml version="1.0" encoding="utf-8"?>\n' +
+			'<manifest xmlns:android="http://schemas.android.com/apk/res/android" ' +
+			"package=\"$packageName\" />"
+
+	def manifestFile = new File(project.buildDir, 'generated/AndroidManifest.xml')
+	if (!manifestFile.exists()) {
+		// Fixes IntelliJ Android plugin error
+		manifestFile.parentFile.mkdirs()
+		manifestFile.write(xml)
+	}
+
+	project.preBuild.dependsOn(project.task('generateManifest', type: GenerateFileTask) {
+		inputText = xml
+		outputFile = manifestFile
+	})
+
+	configureCommon(project, manifestFile)
+}
+
 project.ext.set 'configureExtension', { project, data ->
 	def keyNotFound = { throw new NullPointerException(it + ' is not defined') }
 
@@ -37,6 +85,7 @@ project.ext.set 'configureExtension', { project, data ->
 	def icon = data['icon'] ?: 'ic_custom_' + chanName
 	def updateUri = data['updateUri'] ?: '//raw.githubusercontent.com/Mishiranu/Dashchan/master/update/data.json'
 	def hosts = data['hosts'] ?: keyNotFound('hosts')
+	def customUriHandler = data['customFilter'] ?: false
 	def customFilter = data['customFilter']
 
 	def requiredClasses = ['ChanConfiguration', 'ChanLocator', 'ChanMarkup', 'ChanPerformer']
@@ -60,8 +109,8 @@ project.ext.set 'configureExtension', { project, data ->
 			"android:value=\".${chanNameUpper}ChanLocator\" />\n"
 	xml += '<meta-data android:name="chan.extension.class.markup" ' +
 			"android:value=\".${chanNameUpper}ChanMarkup\" />\n"
-	xml += '<activity android:name="chan.app.UriHandlerActivity" android:label="Dashchan" ' +
-			'android:theme="@android:style/Theme.NoDisplay">\n'
+	xml += '<activity android:name="chan.application.UriHandlerActivity" ' +
+			'android:label="Dashchan" android:theme="@android:style/Theme.NoDisplay">\n'
 	xml += '<intent-filter>\n' +
 			'<action android:name="android.intent.action.VIEW" />\n' +
 			'<category android:name="android.intent.category.DEFAULT" />\n' +
@@ -100,30 +149,15 @@ project.ext.set 'configureExtension', { project, data ->
 	})
 
 	project.archivesBaseName = 'Dashchan' + chanNameUpper
+	configureCommon(project, manifestFile)
 
 	project.android {
-		compileSdkVersion 29
-		buildToolsVersion '29.0.3'
-
 		defaultConfig {
-			minSdkVersion 16
-			targetSdkVersion 29
-
 			// Don't warn about unused classes
 			buildConfigField 'Class[]', 'USED_CLASSES',
 					'{' + requiredClasses.collect { it + '.class' }.join(', ') + '}'
 		}
 
-		sourceSets.main {
-			manifest.srcFile manifestFile
-			java.srcDirs = ['src']
-			resources.srcDirs = []
-			aidl.srcDirs = ['src']
-			renderscript.srcDirs = ['src']
-			res.srcDirs = ['res']
-			assets.srcDirs = ['assets']
-		}
-
 		if (file('keystore.properties').exists()) {
 			def keystoreProperties = new Properties()
 			keystoreProperties.load(new FileInputStream(file('keystore.properties')))
@@ -158,10 +192,12 @@ project.ext.set 'configureExtension', { project, data ->
 			abortOnError false
 			disable 'MissingTranslation'
 		}
+	}
 
-		compileOptions {
-			sourceCompatibility JavaVersion.VERSION_1_8
-			targetCompatibility JavaVersion.VERSION_1_8
+	project.dependencies {
+		compileOnly project.project(':libraries:api')
+		if (!customUriHandler) {
+			implementation project.project(':libraries:urihandler')
 		}
 	}
 }

extensions/dvach/build.gradle

@@ -5,8 +5,3 @@ rootProject.configureExtension(project, [
 		apiVersion: 1,
 		hosts: ['2ch.hk', '2ch.pm', '2ch.cm', '2ch.re', '2ch.tf', '2ch.wf', '2ch.yt', '2-ch.so']
 ])
-
-dependencies {
-	compileOnly 'com.github.mishiranu:dashchan.library:1.7'
-	implementation 'com.github.mishiranu:dashchan.static:1.0'
-}

extensions/endchan/build.gradle

@@ -5,8 +5,3 @@ rootProject.configureExtension(project, [
 		apiVersion: 1,
 		hosts: ['endchan.net', 'endchan.gg', 'endchan.org', 'endchan.xyz']
 ])
-
-dependencies {
-	compileOnly 'com.github.mishiranu:dashchan.library:1.7'
-	implementation 'com.github.mishiranu:dashchan.static:1.0'
-}

extensions/fourchan/build.gradle

@@ -8,6 +8,5 @@ rootProject.configureExtension(project, [
 ])
 
 dependencies {
-	compileOnly 'com.github.mishiranu:dashchan.library:1.7'
-	implementation 'com.github.mishiranu:dashchan.static:1.0'
+	implementation project(':libraries:templateparser')
 }

extensions/local/build.gradle

@@ -4,10 +4,7 @@ rootProject.configureExtension(project, [
 		versionName: '1.8',
 		apiVersion: 1,
 		hosts: ['localhost'],
+		customUriHandler: true,
 		customFilter: '<data android:scheme="file" />\n' +
 				'<data android:mimeType="text/html" />\n'
 ])
-
-dependencies {
-	compileOnly 'com.github.mishiranu:dashchan.library:1.7'
-}

extensions/local/src/chan/app/UriHandlerActivity.java extensions/local/src/chan/application/UriHandlerActivity.java

@@ -1,4 +1,4 @@
-package chan.app;
+package chan.application;
 
 import android.app.Activity;
 import android.content.ActivityNotFoundException;

libraries/api/build.gradle

@@ -0,0 +1,3 @@
+apply plugin: 'com.android.library'
+
+rootProject.configureLibrary(project)