diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index d79c722..ab4574d 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -15,13 +15,13 @@ jobs: publish: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: - java-version: 11 - distribution: adopt + java-version: 17 + distribution: zulu - name: Build documentation run: ./gradlew :library:dokkaHtml diff --git a/.jitpack.yml b/.jitpack.yml index 4f4d58a..b3fce73 100644 --- a/.jitpack.yml +++ b/.jitpack.yml @@ -1,4 +1,4 @@ jdk: - - openjdk11 + - openjdk17 install: - ./gradlew build :library:publishToMavenLocal diff --git a/build.gradle b/build.gradle deleted file mode 100644 index d4caf87..0000000 --- a/build.gradle +++ /dev/null @@ -1,32 +0,0 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. - -buildscript { - ext.kotlin_version = '1.7.10' - repositories { - mavenCentral() - google() - } - dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files - } -} - -plugins { - id 'org.jetbrains.dokka' version '1.7.20' apply false -} - -allprojects { - repositories { - mavenCentral() - google() - maven { url "https://jitpack.io" } - } -} - -task clean(type: Delete) { - delete rootProject.buildDir -} diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..ca3d3ee --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,11 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + +plugins { + alias(libs.plugins.android.library) apply false + alias(libs.plugins.kotlin.android) apply false + alias(libs.plugins.dokka) apply false +} + +tasks.register("clean") { + delete(rootProject.layout.buildDirectory) +} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..f090df4 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,23 @@ +[versions] +agp_version = "8.2.0" +coroutines_version = "1.7.1" +kotlin_version = "1.9.21" +serialization_version = "1.5.1" +dokka_version = "1.9.10" + +[libraries] +coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines_version" } + +kotlin-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization_version" } +kotlin-json-okio = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json-okio", version.ref = "serialization_version" } + +injekt-core = { module = "com.github.inorichi.injekt:injekt-core", version = "65b0440" } +jsoup = { module = "org.jsoup:jsoup", version = "1.16.1" } +okhttp = { module = "com.squareup.okhttp3:okhttp", version = "5.0.0-alpha.11" } +rxandroid = { module = "io.reactivex:rxandroid", version = "1.2.1" } +rxjava = { module = "io.reactivex:rxjava", version = "1.3.8" } + +[plugins] +android-library = { id = "com.android.library", version.ref = "agp_version" } +dokka = { id = "org.jetbrains.dokka", version.ref = "dokka_version" } +kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin_version" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7a3265e..943f0cb 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 070cb70..3499ded 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index cccdd3d..65dcd68 100755 --- a/gradlew +++ b/gradlew @@ -1,78 +1,129 @@ -#!/usr/bin/env sh +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -81,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -89,84 +140,105 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=$((i+1)) + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" fi +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index f955316..6689b85 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,84 +1,92 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/library/Module.md b/library/Module.md index 710af7f..e690a3f 100644 --- a/library/Module.md +++ b/library/Module.md @@ -28,3 +28,5 @@ Useful methods for creating http requests and manipulate responses. # Package eu.kanade.tachiyomi.network.interceptor Useful methods to slow down http requests and prevent IP-ban or accidental DDoS. +# Package eu.kanade.tachiyomi.util +General utility methods. diff --git a/library/build.gradle b/library/build.gradle deleted file mode 100644 index a6d84e8..0000000 --- a/library/build.gradle +++ /dev/null @@ -1,91 +0,0 @@ -import org.jetbrains.dokka.gradle.DokkaTask -import org.jetbrains.dokka.DokkaConfiguration.Visibility - -plugins { - id 'com.android.library' - id 'kotlin-android' - id 'maven-publish' - id 'org.jetbrains.dokka' -} - -android { - compileSdkVersion 33 - - defaultConfig { - minSdkVersion 21 - targetSdkVersion 33 - versionName '14' - } - - buildTypes { - release { - minifyEnabled false - } - } -} - -dependencies { - compileOnly("com.squareup.okhttp3:okhttp:5.0.0-alpha.11") - compileOnly("io.reactivex:rxjava:1.3.8") - compileOnly("io.reactivex:rxandroid:1.2.1") - compileOnly("org.jsoup:jsoup:1.15.3") - compileOnly("com.github.inorichi.injekt:injekt-core:65b0440") - compileOnly("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1") - def json = "1.5.1" - compileOnly("org.jetbrains.kotlinx:kotlinx-serialization-json:$json") - compileOnly("org.jetbrains.kotlinx:kotlinx-serialization-json-okio:$json") -} - -task androidSourcesJar(type: Jar) { - classifier 'sources' - from android.sourceSets.main.java.srcDirs -} - -tasks.withType(DokkaTask.class) { - dokkaSourceSets { - named("main") { - moduleName.set("extensions-lib") - moduleVersion.set(android.defaultConfig.versionName) - outputDirectory.set(file("build/docs/")) - // Speedup doc generation - // offlineMode.set(true) - includes.from("Module.md") - - perPackageOption { - matchingRegex.set("android.content") - suppress.set(true) - } - - documentedVisibilities.set([ - Visibility.PUBLIC, - Visibility.PROTECTED - ]) - - externalDocumentationLink { - url.set(new URL("https://square.github.io/okhttp/4.x/")) - // https://github.com/square/okhttp/issues/7338 - packageListUrl.set(new URL("https://colinwhite.me/okhttp3-package-list")) - } - - externalDocumentationLink { - url.set(new URL("https://jsoup.org/apidocs/")) - packageListUrl.set(new URL("https://jsoup.org/apidocs/element-list")) - } - - externalDocumentationLink { - url.set(new URL("https://reactivex.io/RxJava/1.x/javadoc/")) - } - } - } -} - -project.afterEvaluate { - publishing { - publications { - release(MavenPublication) { - from components.release - artifact androidSourcesJar - } - } - } -} diff --git a/library/build.gradle.kts b/library/build.gradle.kts new file mode 100644 index 0000000..0854091 --- /dev/null +++ b/library/build.gradle.kts @@ -0,0 +1,99 @@ +import java.net.URL +import org.jetbrains.dokka.DokkaConfiguration.Visibility +import org.jetbrains.dokka.gradle.DokkaTask + +plugins { + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) + `maven-publish` + alias(libs.plugins.dokka) +} + +val ver = "14" +version = ver +group = "com.github.aniyomiorg" + +android { + compileSdk = 34 + namespace = "eu.kanade.tachiyomi.animeextensions" + + defaultConfig { + minSdk = 21 + } + + buildTypes { + named("release") { + isMinifyEnabled = false + } + } + + val javaVersion = JavaVersion.VERSION_1_8 + compileOptions { + sourceCompatibility = javaVersion + targetCompatibility = javaVersion + } + + kotlinOptions { + jvmTarget = javaVersion.toString() + } +} + +dependencies { + compileOnly(libs.okhttp) + compileOnly(libs.jsoup) + compileOnly(libs.rxjava) + compileOnly(libs.rxandroid) + compileOnly(libs.injekt.core) + compileOnly(libs.coroutines) + compileOnly(libs.kotlin.json) + compileOnly(libs.kotlin.json.okio) +} + +tasks.withType().configureEach { + dokkaSourceSets { + named("main") { + moduleName.set("extensions-lib") + moduleVersion.set(ver) + outputDirectory.set(file("build/docs/")) + // Speedup doc generation + // offlineMode.set(true) + includes.from("Module.md") + + perPackageOption { + matchingRegex.set("android.content") + suppress.set(true) + } + + documentedVisibilities.set( + setOf(Visibility.PUBLIC, Visibility.PROTECTED) + ) + + // Note: this will show up a bruhzillion of warnings due to + // https://github.com/Kotlin/dokka/issues/3120 + externalDocumentationLink { + url.set(URL("https://square.github.io/okhttp/5.x/")) + } + + externalDocumentationLink { + url.set(URL("https://jsoup.org/apidocs/")) + packageListUrl.set(URL("https://jsoup.org/apidocs/element-list")) + } + + externalDocumentationLink { + url.set(URL("https://reactivex.io/RxJava/1.x/javadoc/")) + } + } + } +} + +publishing { + publications { + create("maven") { + artifactId = "extensions-lib" + + afterEvaluate { + from(components["release"]) + } + } + } +} diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml deleted file mode 100644 index cd32f5e..0000000 --- a/library/src/main/AndroidManifest.xml +++ /dev/null @@ -1 +0,0 @@ - diff --git a/library/src/main/java/androidx/preference/Preference.java b/library/src/main/java/androidx/preference/Preference.java index 502c39f..08dd310 100644 --- a/library/src/main/java/androidx/preference/Preference.java +++ b/library/src/main/java/androidx/preference/Preference.java @@ -30,6 +30,10 @@ public void setEnabled(boolean enabled) { throw new RuntimeException("Stub!"); } + public void setVisible(boolean visible) { + throw new RuntimeException("Stub!"); + } + public String getKey() { throw new RuntimeException("Stub!"); } diff --git a/library/src/main/java/eu/kanade/tachiyomi/AppInfo.kt b/library/src/main/java/eu/kanade/tachiyomi/AppInfo.kt index 553f5d7..ad23b40 100644 --- a/library/src/main/java/eu/kanade/tachiyomi/AppInfo.kt +++ b/library/src/main/java/eu/kanade/tachiyomi/AppInfo.kt @@ -5,6 +5,19 @@ package eu.kanade.tachiyomi * Can be useful for temporary fixes, preferences, header values, logging, etc. */ object AppInfo { + /** + * Version code of the host application. May be useful for sharing as User-Agent information. + * Note that this value differs between forks so logic should not rely on it. + * + * @since extension-lib 13 + */ fun getVersionCode(): Int = throw Exception("Stub!") + + /** + * Version name of the host application. May be useful for sharing as User-Agent information. + * Note that this value differs between forks so logic should not rely on it. + * + * @since extension-lib 13 + */ fun getVersionName(): String = throw Exception("Stub!") } diff --git a/library/src/main/java/eu/kanade/tachiyomi/animesource/AnimeCatalogueSource.kt b/library/src/main/java/eu/kanade/tachiyomi/animesource/AnimeCatalogueSource.kt index a93f1dd..942a506 100644 --- a/library/src/main/java/eu/kanade/tachiyomi/animesource/AnimeCatalogueSource.kt +++ b/library/src/main/java/eu/kanade/tachiyomi/animesource/AnimeCatalogueSource.kt @@ -17,30 +17,57 @@ interface AnimeCatalogueSource : AnimeSource { val supportsLatest: Boolean /** - * Returns an observable containing a page with a list of anime. + * Get a page with a list of anime. * + * @since extensions-lib 14 * @param page the page number to retrieve. */ - fun fetchPopularAnime(page: Int): Observable + suspend fun getPopularAnime(page: Int): AnimesPage { + throw Exception("Stub!") + } /** - * Returns an observable containing a page with a list of anime. + * Get a page with a list of anime. * + * @since extensions-lib 14 * @param page the page number to retrieve. * @param query the search query. * @param filters the list of filters to apply. */ - fun fetchSearchAnime(page: Int, query: String, filters: AnimeFilterList): Observable + suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage { + throw Exception("Stub!") + } /** - * Returns an observable containing a page with a list of latest anime updates. + * Get a page with a list of latest anime updates. * + * @since extensions-lib 14 * @param page the page number to retrieve. */ - fun fetchLatestUpdates(page: Int): Observable + suspend fun getLatestUpdates(page: Int): AnimesPage { + throw Exception("Stub!") + } /** * Returns the list of filters for the source. */ fun getFilterList(): AnimeFilterList -} \ No newline at end of file + + @Deprecated( + "Use the non-RxJava API instead", + ReplaceWith("getPopularAnime"), + ) + fun fetchPopularAnime(page: Int): Observable + + @Deprecated( + "Use the non-RxJava API instead", + ReplaceWith("getSearchAnime"), + ) + fun fetchSearchAnime(page: Int, query: String, filters: AnimeFilterList): Observable + + @Deprecated( + "Use the non-RxJava API instead", + ReplaceWith("getLatestUpdates"), + ) + fun fetchLatestUpdates(page: Int): Observable +} diff --git a/library/src/main/java/eu/kanade/tachiyomi/animesource/AnimeSource.kt b/library/src/main/java/eu/kanade/tachiyomi/animesource/AnimeSource.kt index 4b567e2..636a8f4 100644 --- a/library/src/main/java/eu/kanade/tachiyomi/animesource/AnimeSource.kt +++ b/library/src/main/java/eu/kanade/tachiyomi/animesource/AnimeSource.kt @@ -21,23 +21,47 @@ interface AnimeSource { val name: String /** - * Returns an observable with the updated details for a anime. + * Get the updated details for a anime. * + * @since extensions-lib 14 * @param anime the anime to update. + * @return the updated anime. */ - fun fetchAnimeDetails(anime: SAnime): Observable + suspend fun getAnimeDetails(anime: SAnime): SAnime /** - * Returns an observable with all the available episodes for a anime. + * Get all the available episodes for a anime. * + * @since extensions-lib 14 * @param anime the anime to update. + * @return the episodes for the anime. */ - fun fetchEpisodeList(anime: SAnime): Observable> + suspend fun getEpisodeList(anime: SAnime): List /** - * Returns an observable with a list of video for the episode of an anime. + * Get the list of videos a episode has. * - * @param episode the anime to update. + * @since extensions-lib 14 + * @param episode the episode. + * @return the videos for the episode. */ + suspend fun getVideoList(episode: SEpisode): List