Removed kapt and conscrypt (not compatible with aarch64)

This commit is contained in:
Robinson 2022-12-06 01:26:16 +01:00
parent 1d0731c946
commit b9eeaf2f71
No known key found for this signature in database
GPG Key ID: 8E7DB78588BD6F5C
3 changed files with 27 additions and 43 deletions

47
LICENSE
View File

@ -1,11 +1,29 @@
- KloudflareAPI -
[The Apache Software License, Version 2.0]
https://git.dorkbox.com/dorkbox/KloudflareAPI
Copyright 2021
Copyright 2022
Dorkbox LLC
Cloudflare API v4 for Kotlin
Extra license information
- OkHttp - Squares meticulous HTTP client for the JVM, Android, and GraalVM
[The Apache Software License, Version 2.0]
https://github.com/square/okhttp
Copyright 2022
Square, Inc
- Retrofit - A type-safe HTTP client for Android and the JVM
[The Apache Software License, Version 2.0]
https://github.com/square/retrofit
Copyright 2022
Square, Inc
- Moshi - A modern JSON library for Kotlin and Java
[The Apache Software License, Version 2.0]
https://github.com/square/moshi
Copyright 2022
Square, Inc
- Kotlin -
[The Apache Software License, Version 2.0]
https://github.com/JetBrains/kotlin
@ -14,33 +32,6 @@
Kotlin Compiler, Test Data+Libraries, and Tools repository contain third-party code, to which different licenses may apply
See: https://github.com/JetBrains/kotlin/blob/master/license/README.md
- OkHttp - Squares meticulous HTTP client for the JVM, Android, and GraalVM
[The Apache Software License, Version 2.0]
https://github.com/square/okhttp
Copyright 2021
Square, Inc
- Conscrypt - An open platform for building modern web apps for Java back ends
[The Apache Software License, Version 2.0]
https://github.com/google/conscrypt
Copyright 2021
Google Inc
The Android Open Source Project
The Netty Project
Apache Harmony
- Retrofit - A type-safe HTTP client for Android and the JVM
[The Apache Software License, Version 2.0]
https://github.com/square/retrofit
Copyright 2021
Square, Inc
- Moshi - A modern JSON library for Kotlin and Java
[The Apache Software License, Version 2.0]
https://github.com/square/moshi
Copyright 2021
Square, Inc
- Updates - Software Update Management
[The Apache Software License, Version 2.0]
https://git.dorkbox.com/dorkbox/Updates

View File

@ -31,8 +31,14 @@ plugins {
id("com.dorkbox.VersionUpdate") version "2.5"
id("com.dorkbox.GradlePublish") version "1.13"
kotlin("jvm") version "1.5.21"
kotlin("kapt") version "1.5.21"
// this allows us to drop generated moshi JSON code directly into bytecode using kotlin-ir (faster and better than KSP or KAPT).
// https://github.com/ZacSweers/MoshiX
// There are several issues with KSP.
// 1) It runs on every compile (it's not cached)
// 2) It is not possible to (at last I don't know) how to run this via IntelliJ compiles (it's only via Gradle)
id("dev.zacsweers.moshix") version "0.19.0" apply(false)
kotlin("jvm") version "1.7.21"
}
object Extras {
@ -124,10 +130,6 @@ dependencies {
api("com.squareup.moshi:moshi-kotlin:$moshiVer")
api("com.dorkbox:Updates:1.1")
// for AUTOMATIC kotlin reflective serialization of json classes
kapt ("com.squareup.moshi:moshi-kotlin-codegen:$moshiVer")
kaptTest ("com.squareup.moshi:moshi-kotlin-codegen:$moshiVer")
}
publishToSonatype {

View File

@ -32,14 +32,12 @@ import dorkbox.kloudflareApi.api.zone.settings.ZoneSetting
import okhttp3.OkHttpClient
import okhttp3.Request
import okhttp3.ResponseBody
import org.conscrypt.Conscrypt
import retrofit2.Call
import retrofit2.Converter
import retrofit2.Response
import retrofit2.Retrofit
import retrofit2.converter.moshi.MoshiConverterFactory
import java.io.IOException
import java.security.Security
class Kloudflare(private val xAuthEmail: String, private val xAuthKey: String) {
@ -54,13 +52,6 @@ class Kloudflare(private val xAuthEmail: String, private val xAuthKey: String) {
init {
// Add this project to the updates system, which verifies this class + UUID + version information
dorkbox.updates.Updates.add(Kloudflare::class.java, "16bcc9060ac6483782aafc2a5502e7b3", version)
try {
Security.insertProviderAt(Conscrypt.newProvider(), 0)
}
catch (e: Throwable) {
e.printStackTrace()
}
}
}