diff --git a/common.gradle b/common.gradle index 9f3a255ea..769166a92 100644 --- a/common.gradle +++ b/common.gradle @@ -3,6 +3,7 @@ apply plugin: 'org.jmailen.kotlinter' android { compileSdkVersion AndroidConfig.compileSdk + namespace "eu.kanade.tachiyomi.extension" sourceSets { main { manifest.srcFile "AndroidManifest.xml" diff --git a/core/AndroidManifest.xml b/core/AndroidManifest.xml index 77ee6b239..ed0e26f0d 100644 --- a/core/AndroidManifest.xml +++ b/core/AndroidManifest.xml @@ -1,6 +1,5 @@ - + diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 90524827b..d3e951c3e 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -9,6 +9,8 @@ android { minSdk = AndroidConfig.minSdk } + namespace = "eu.kanade.tachiyomi.extension" + sourceSets { named("main") { manifest.srcFile("AndroidManifest.xml") diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180f2..943f0cbfa 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 070cb702f..c30b486a8 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.3-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c78733..65dcd68d6 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# 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/. @@ -80,10 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# 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='"-Xmx64m" "-Xms64m"' @@ -143,12 +143,16 @@ 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 @@ -205,6 +209,12 @@ set -- \ 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. diff --git a/gradlew.bat b/gradlew.bat index ac1b06f93..6689b85be 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +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! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +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 diff --git a/lib/cryptoaes/build.gradle.kts b/lib/cryptoaes/build.gradle.kts index 5eaa29645..caabcb291 100644 --- a/lib/cryptoaes/build.gradle.kts +++ b/lib/cryptoaes/build.gradle.kts @@ -10,6 +10,8 @@ android { minSdk = AndroidConfig.minSdk targetSdk = AndroidConfig.targetSdk } + + namespace = "eu.kanade.tachiyomi.lib.cryptoaes" } repositories { diff --git a/lib/cryptoaes/src/main/AndroidManifest.xml b/lib/cryptoaes/src/main/AndroidManifest.xml deleted file mode 100644 index 1ac16ea73..000000000 --- a/lib/cryptoaes/src/main/AndroidManifest.xml +++ /dev/null @@ -1,2 +0,0 @@ - diff --git a/lib/dataimage/build.gradle.kts b/lib/dataimage/build.gradle.kts index d02fbec56..d5fcea1df 100644 --- a/lib/dataimage/build.gradle.kts +++ b/lib/dataimage/build.gradle.kts @@ -10,6 +10,8 @@ android { minSdk = AndroidConfig.minSdk targetSdk = AndroidConfig.targetSdk } + + namespace = "eu.kanade.tachiyomi.lib.dataimage" } repositories { diff --git a/lib/dataimage/src/main/AndroidManifest.xml b/lib/dataimage/src/main/AndroidManifest.xml deleted file mode 100644 index 11d9e3ff5..000000000 --- a/lib/dataimage/src/main/AndroidManifest.xml +++ /dev/null @@ -1,2 +0,0 @@ - diff --git a/lib/i18n/build.gradle.kts b/lib/i18n/build.gradle.kts index 5eaa29645..4a741aa0a 100644 --- a/lib/i18n/build.gradle.kts +++ b/lib/i18n/build.gradle.kts @@ -10,6 +10,8 @@ android { minSdk = AndroidConfig.minSdk targetSdk = AndroidConfig.targetSdk } + + namespace = "eu.kanade.tachiyomi.lib.i18n" } repositories { diff --git a/lib/i18n/src/main/AndroidManifest.xml b/lib/i18n/src/main/AndroidManifest.xml deleted file mode 100644 index 04965588a..000000000 --- a/lib/i18n/src/main/AndroidManifest.xml +++ /dev/null @@ -1,2 +0,0 @@ - diff --git a/lib/randomua/build.gradle.kts b/lib/randomua/build.gradle.kts index 5c46699c4..39942da28 100644 --- a/lib/randomua/build.gradle.kts +++ b/lib/randomua/build.gradle.kts @@ -6,12 +6,13 @@ plugins { android { compileSdk = AndroidConfig.compileSdk - namespace = "eu.kanade.tachiyomi.lib.randomua" defaultConfig { minSdk = AndroidConfig.minSdk targetSdk = AndroidConfig.targetSdk } + + namespace = "eu.kanade.tachiyomi.lib.randomua" } repositories { diff --git a/lib/synchrony/build.gradle.kts b/lib/synchrony/build.gradle.kts index 38ccda93f..d53ef825e 100644 --- a/lib/synchrony/build.gradle.kts +++ b/lib/synchrony/build.gradle.kts @@ -5,12 +5,13 @@ plugins { android { compileSdk = AndroidConfig.compileSdk - namespace = "eu.kanade.tachiyomi.lib.synchrony" defaultConfig { minSdk = AndroidConfig.minSdk targetSdk = AndroidConfig.targetSdk } + + namespace = "eu.kanade.tachiyomi.lib.synchrony" } repositories { diff --git a/lib/textinterceptor/build.gradle.kts b/lib/textinterceptor/build.gradle.kts index e8086827c..aa5a1762c 100644 --- a/lib/textinterceptor/build.gradle.kts +++ b/lib/textinterceptor/build.gradle.kts @@ -10,6 +10,8 @@ android { minSdk = AndroidConfig.minSdk targetSdk = AndroidConfig.targetSdk } + + namespace = "eu.kanade.tachiyomi.lib.textinterceptor" } repositories { diff --git a/lib/textinterceptor/src/main/AndroidManifest.xml b/lib/textinterceptor/src/main/AndroidManifest.xml deleted file mode 100644 index 6d52001ad..000000000 --- a/lib/textinterceptor/src/main/AndroidManifest.xml +++ /dev/null @@ -1,2 +0,0 @@ - diff --git a/multisrc/build.gradle.kts b/multisrc/build.gradle.kts index dbc098f91..511012eff 100644 --- a/multisrc/build.gradle.kts +++ b/multisrc/build.gradle.kts @@ -12,6 +12,8 @@ android { targetSdk = AndroidConfig.targetSdk } + namespace = "eu.kanade.tachiyomi.lib.themesources" + kotlinOptions { freeCompilerArgs += "-opt-in=kotlinx.serialization.ExperimentalSerializationApi" } diff --git a/multisrc/src/main/AndroidManifest.xml b/multisrc/src/main/AndroidManifest.xml deleted file mode 100644 index 17ee0c14a..000000000 --- a/multisrc/src/main/AndroidManifest.xml +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/en/apairof2/src/eu/kanade/tachiyomi/extension/en/apairof2/APairOf2.kt b/src/en/apairof2/src/eu/kanade/tachiyomi/extension/en/apairof2/APairOf2.kt index 91f687155..0d736289b 100644 --- a/src/en/apairof2/src/eu/kanade/tachiyomi/extension/en/apairof2/APairOf2.kt +++ b/src/en/apairof2/src/eu/kanade/tachiyomi/extension/en/apairof2/APairOf2.kt @@ -142,7 +142,7 @@ class APairOf2 : ParsedHttpSource() { return document.select(".swiper-slide img").mapIndexed { index, img -> Page( index = index, - imageUrl = img.imgAttr() + imageUrl = img.imgAttr(), ) } } diff --git a/src/en/grrlpower/src/eu/kanade/tachiyomi/extension/en/grrlpower/GrrlPower.kt b/src/en/grrlpower/src/eu/kanade/tachiyomi/extension/en/grrlpower/GrrlPower.kt index 7279ace40..ddda5d2c7 100644 --- a/src/en/grrlpower/src/eu/kanade/tachiyomi/extension/en/grrlpower/GrrlPower.kt +++ b/src/en/grrlpower/src/eu/kanade/tachiyomi/extension/en/grrlpower/GrrlPower.kt @@ -93,8 +93,8 @@ class GrrlPower( name = link.text() setUrlWithoutDomain(link.attr("href")) date_upload = date?.time ?: 0L - // chapter_number isn't set as suggested by arkon - // https://github.com/tachiyomiorg/tachiyomi-extensions/pull/15717#discussion_r1138014748 + // chapter_number isn't set as suggested by arkon + // https://github.com/tachiyomiorg/tachiyomi-extensions/pull/15717#discussion_r1138014748 } } } diff --git a/src/en/mangapill/src/eu/kanade/tachiyomi/extension/en/mangapill/MangaPill.kt b/src/en/mangapill/src/eu/kanade/tachiyomi/extension/en/mangapill/MangaPill.kt index 9414c4e86..c1e8fcda2 100644 --- a/src/en/mangapill/src/eu/kanade/tachiyomi/extension/en/mangapill/MangaPill.kt +++ b/src/en/mangapill/src/eu/kanade/tachiyomi/extension/en/mangapill/MangaPill.kt @@ -22,7 +22,7 @@ class MangaPill : ParsedHttpSource() { override val supportsLatest = true override val client: OkHttpClient = network.cloudflareClient override fun headersBuilder() = super.headersBuilder().add("Referer", "$baseUrl/") - + override fun popularMangaRequest(page: Int): Request = latestUpdatesRequest(page) override fun latestUpdatesRequest(page: Int): Request { diff --git a/src/en/questionablecontent/src/eu/kanade/tachiyomi/extension/en/questionablecontent/QuestionableContent.kt b/src/en/questionablecontent/src/eu/kanade/tachiyomi/extension/en/questionablecontent/QuestionableContent.kt index f34524ff9..e174ca68c 100644 --- a/src/en/questionablecontent/src/eu/kanade/tachiyomi/extension/en/questionablecontent/QuestionableContent.kt +++ b/src/en/questionablecontent/src/eu/kanade/tachiyomi/extension/en/questionablecontent/QuestionableContent.kt @@ -16,7 +16,6 @@ import eu.kanade.tachiyomi.source.online.ParsedHttpSource import okhttp3.OkHttpClient import okhttp3.Request import okhttp3.Response -import okhttp3.internal.http.HTTP_UNAUTHORIZED import org.jsoup.nodes.Document import org.jsoup.nodes.Element import rx.Observable @@ -113,7 +112,6 @@ class QuestionableContent : ParsedHttpSource(), ConfigurableSource { title = "Show author's notes" summary = "Enable to see the author's notes at the end of chapters (if they're there)." setDefaultValue(false) - } screen.addPreference(authorsNotesPref) }