Update to SDK 29 (#3629)

* Print out repo JSON contents during build

* Target SDK 29
This commit is contained in:
arkon 2020-06-27 15:21:46 -04:00 committed by GitHub
parent be6c269621
commit e405512146
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 12 deletions

View File

@ -3,14 +3,14 @@ language: android
android:
components:
- build-tools-29.0.3
- android-27
- android-29
- extra-android-m2repository
- extra-google-m2repository
- extra-android-support
licenses:
- android-sdk-license-.+
before_install:
- yes | sdkmanager "platforms;android-27" # workaround for accepting the license
- yes | sdkmanager "platforms;android-29" # workaround for accepting the license
- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
openssl aes-256-cbc -K $encrypted_5ba4ee4c096f_key -iv $encrypted_5ba4ee4c096f_iv -in "$PWD/.travis/secrets.tar.enc" -out secrets.tar -d;
tar xf secrets.tar;

View File

@ -18,7 +18,7 @@ for APK in ${APKS[@]}; do
BADGING="$(${TOOLS}/aapt dump badging $APK)"
PACKAGE=$(echo "$BADGING" | grep package:)
PKGNAME=$(echo $PACKAGE | grep -Po "name='\K[^']+")
PKGNAME=$(echo $PACKAGE | grep -Po "package: name='\K[^']+")
VCODE=$(echo $PACKAGE | grep -Po "versionCode='\K[^']+")
VNAME=$(echo $PACKAGE | grep -Po "versionName='\K[^']+")
@ -40,3 +40,5 @@ for APK in ${APKS[@]}; do
'{name:$name, pkg:$pkg, apk:$apk, lang:$lang, code:$code, version:$version}'
done | jq -scr '[.[]]' > index.json
cat index.json

View File

@ -1,6 +1,6 @@
object AndroidConfig {
const val compileSdk = 27
const val compileSdk = 29
const val minSdk = 16
const val targetSdk = 27
const val targetSdk = 29
const val buildTools = "29.0.3"
}

View File

@ -1,7 +1,7 @@
apply plugin: 'org.jmailen.kotlinter'
android {
compileSdkVersion 27
compileSdkVersion 29
buildToolsVersion '29.0.3'
buildTypes {
@ -32,7 +32,7 @@ android {
defaultConfig {
minSdkVersion 16
targetSdkVersion 27
targetSdkVersion 29
applicationIdSuffix pkgNameSuffix
versionCode extVersionCode
versionName "$libVersion.$extVersionCode"

View File

@ -24,6 +24,10 @@ import eu.kanade.tachiyomi.source.model.Page
import eu.kanade.tachiyomi.source.model.SChapter
import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.source.online.HttpSource
import java.text.DecimalFormat
import java.text.SimpleDateFormat
import java.util.Date
import java.util.Locale
import okhttp3.Credentials
import okhttp3.Headers
import okhttp3.HttpUrl
@ -35,10 +39,6 @@ import rx.android.schedulers.AndroidSchedulers
import rx.schedulers.Schedulers
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
import java.text.DecimalFormat
import java.text.SimpleDateFormat
import java.util.Date
import java.util.Locale
open class Komga(suffix: String = "") : ConfigurableSource, HttpSource() {
override fun popularMangaRequest(page: Int): Request =

View File

@ -245,7 +245,7 @@ open class NewToki(override val name: String, private val defaultBaseUrl: String
screen.addPreference(baseUrlPref)
}
private fun getPrefBaseUrl(): String = preferences.getString(BASE_URL_PREF, defaultBaseUrl)
private fun getPrefBaseUrl(): String = preferences.getString(BASE_URL_PREF, defaultBaseUrl)!!
companion object {
private const val BASE_URL_PREF_TITLE = "Override BaseUrl"