Update gradle config

.github/workflows/test-parsers.yml

@@ -16,7 +16,7 @@ jobs:
             -   uses: actions/checkout@v3
             -   uses: actions/setup-java@v3
                 with:
-                    java-version: '17'
+                    java-version: '11'
                     distribution: 'temurin'
                     cache: 'gradle'
             -   run: ./gradlew :test --tests "org.koitharu.kotatsu.parsers.MangaParserTest" || true

.idea/kotlinc.xml

@@ -3,4 +3,4 @@
   <component name="KotlinJpsPluginSettings">
     <option name="version" value="1.8.22" />
   </component>
-</project>
+</project>

build.gradle

@@ -2,8 +2,8 @@ import tasks.ReportGenerateTask
 
 plugins {
 	id 'java-library'
-	id 'org.jetbrains.kotlin.jvm'
+	id 'org.jetbrains.kotlin.jvm' version '1.8.21'
-	id 'com.google.devtools.ksp'
+	id 'com.google.devtools.ksp' version '1.8.22-1.0.11'
 	id 'maven-publish'
 }
 
@@ -16,7 +16,6 @@ test {
 
 compileKotlin {
 	kotlinOptions {
-		jvmTarget = '1.8'
 		freeCompilerArgs += [
 			'-opt-in=kotlin.RequiresOptIn',
 			'-opt-in=kotlin.contracts.ExperimentalContracts',
@@ -28,7 +27,6 @@ compileKotlin {
 
 compileTestKotlin {
 	kotlinOptions {
-		jvmTarget = '1.8'
 		freeCompilerArgs += [
 			'-opt-in=kotlin.RequiresOptIn',
 			'-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi',
@@ -38,6 +36,7 @@ compileTestKotlin {
 }
 
 kotlin {
+	jvmToolchain(11)
 	sourceSets {
 		main.kotlin.srcDirs += 'build/generated/ksp/main/kotlin'
 	}
@@ -70,5 +69,6 @@ dependencies {
 	testImplementation 'io.webfolder:quickjs:1.1.0'
 }
 
-//noinspection ConfigurationAvoidance
+tasks.register('generateTestsReport', ReportGenerateTask) {
-task generateTestsReport(type: ReportGenerateTask)
+	dependsOn test
+}

buildSrc/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id('org.jetbrains.kotlin.jvm') version '1.6.21'
+	id 'org.jetbrains.kotlin.jvm' version '1.8.21'
 }
 repositories {
 	mavenCentral()
@@ -8,6 +8,6 @@ repositories {
 dependencies {
 	implementation gradleApi()
 	implementation 'org.simpleframework:simple-xml:2.7.1'
-	implementation 'com.soywiz.korlibs.korte:korte-jvm:3.0.0-Beta5'
+	implementation 'com.soywiz.korlibs.korte:korte-jvm:4.0.6'
-	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.3'
+	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1'
-}
+}

buildSrc/src/main/kotlin/tasks/ReportGenerateTask.kt

@@ -1,6 +1,6 @@
 package tasks
 
-import com.soywiz.korte.Template
+import korlibs.template.Template
 import kotlinx.coroutines.runBlocking
 import org.gradle.api.DefaultTask
 import org.gradle.api.tasks.TaskAction

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

kotatsu-parsers-ksp/build.gradle

@@ -1,7 +1,7 @@
 plugins {
-	id 'org.jetbrains.kotlin.jvm'
+	id 'org.jetbrains.kotlin.jvm' version '1.8.21'
 }
 
 dependencies {
-	implementation 'com.google.devtools.ksp:symbol-processing-api:1.6.21-1.0.5'
+	implementation 'com.google.devtools.ksp:symbol-processing-api:1.8.22-1.0.11'
-}
+}

kotatsu-parsers-ksp/src/main/kotlin/org/koitharu/kotatsu/parsers/ksp/ParserProcessor.kt

@@ -70,6 +70,7 @@ class ParserProcessor(
 				import org.koitharu.kotatsu.parsers.model.MangaSource
 				
 				@Suppress("DEPRECATION")
+				@InternalParsersApi
 				@Deprecated("", replaceWith = ReplaceWith("context.newParserInstance(this)"))
 				fun MangaSource.newParser(context: MangaLoaderContext): MangaParser = when (this) {
 				

settings.gradle

@@ -1,19 +1,16 @@
 pluginManagement {
-	plugins {
-		id 'com.google.devtools.ksp' version '1.8.22-1.0.11'
-		id 'org.jetbrains.kotlin.jvm' version '1.8.22'
-	}
 	repositories {
-		gradlePluginPortal()
 		google()
+		mavenCentral()
+		gradlePluginPortal()
 	}
 }
 
 dependencyResolutionManagement {
-	repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
 	repositories {
 		google()
 		mavenCentral()
+		gradlePluginPortal()
 	}
 }
 

src/main/kotlin/org/koitharu/kotatsu/parsers/MangaLoaderContext.kt

@@ -12,7 +12,8 @@ abstract class MangaLoaderContext {
 
 	abstract val cookieJar: CookieJar
 
-	fun newParserInstance(source: MangaSource): MangaParser = this.newParserInstance(source)
+	@Suppress("DEPRECATION")
+	fun newParserInstance(source: MangaSource): MangaParser = source.newParser(this)
 
 	open fun encodeBase64(data: ByteArray): String = Base64.getEncoder().encodeToString(data)