diff --git a/README.md b/README.md index e2d2324..1db7c80 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,11 @@ -[ ![latest version](https://api.bintray.com/packages/inorichi/tachiyomi/extensions-library/images/download.svg) ](https://bintray.com/inorichi/tachiyomi/extensions-library/_latestVersion) - The extensions library used in Tachiyomi. + +``` +ext { + libVersion = '1.2' +} + +dependencies { + compileOnly "com.github.tachiyomiorg:extensions-lib:$libVersion" +} +``` diff --git a/build.gradle b/build.gradle index 3531e8d..4c40e6a 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,6 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:2.2.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.1' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' // NOTE: Do not place your application dependencies here; they belong diff --git a/library/build.gradle b/library/build.gradle index 068a2a8..2fce15c 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,7 +1,6 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' apply plugin: 'com.github.dcendents.android-maven' -apply plugin: 'com.jfrog.bintray' version = '1.2' @@ -25,8 +24,8 @@ android { } dependencies { - provided "com.squareup.okhttp3:okhttp:3.8.1" - provided "io.reactivex:rxjava:1.3.0" + provided "com.squareup.okhttp3:okhttp:3.10.0" + provided "io.reactivex:rxjava:1.3.6" provided "org.jsoup:jsoup:1.10.2" provided "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } @@ -36,9 +35,6 @@ repositories { } ext { - bintrayRepo = 'tachiyomi' - bintrayName = 'extensions-library' - publishedGroupId = 'eu.kanade.tachiyomi' libraryName = 'tachiyomi-extensions-lib' artifact = 'extensions-library' @@ -51,7 +47,6 @@ ext { licenseName = 'The Apache Software License, Version 2.0' licenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt' - allLicenses = ["Apache-2.0"] } group = publishedGroupId @@ -84,7 +79,6 @@ install { connection gitUrl developerConnection gitUrl url siteUrl - } } } @@ -103,33 +97,3 @@ artifacts { archives sourcesJar archives makeJar } - -// Bintray -Properties properties = new Properties() -properties.load(project.rootProject.file('local.properties').newDataInputStream()) - -bintray { - user = properties.getProperty("bintray.user") - key = properties.getProperty("bintray.apikey") - - configurations = ['archives'] - pkg { - repo = bintrayRepo - name = bintrayName - desc = libraryDescription - websiteUrl = siteUrl - issueTrackerUrl = siteUrl+'/issues' - vcsUrl = gitUrl - licenses = allLicenses - githubRepo = githubRepository - publish = true - publicDownloadNumbers = true - version { - desc = libraryDescription - gpg { - sign = true - passphrase = properties.getProperty("bintray.gpg.password") - } - } - } -} diff --git a/library/src/main/java/android/content/Context.java b/library/src/main/java/android/content/Context.java index f27638c..e8c866c 100644 --- a/library/src/main/java/android/content/Context.java +++ b/library/src/main/java/android/content/Context.java @@ -1,7 +1,3 @@ package android.content; -/** - * Created by Carlos on 5/9/2018. - */ - public class Context {} diff --git a/library/src/main/java/eu/kanade/tachiyomi/source/ConfigurableSource.kt b/library/src/main/java/eu/kanade/tachiyomi/source/ConfigurableSource.kt index fb8ed4e..6a966ff 100644 --- a/library/src/main/java/eu/kanade/tachiyomi/source/ConfigurableSource.kt +++ b/library/src/main/java/eu/kanade/tachiyomi/source/ConfigurableSource.kt @@ -4,6 +4,6 @@ interface ConfigurableSource { fun setupPreferenceScreen(screen: android.support.v7.preference.PreferenceScreen) - fun setupPreferenceScreen(screen: androidx.preference.PreferenceScreen ) + fun setupPreferenceScreen(screen: androidx.preference.PreferenceScreen) }