修复远端仓库无法正常依赖的问题,升级到1.3.9

pull/34/head
赵文文 5 years ago
parent 011a1c5505
commit 76c9f8f181
  1. 11
      README.md
  2. 11
      README_EN.md
  3. 15
      app/build.gradle
  4. 11
      build.gradle
  5. 124
      nsfw/build.gradle
  6. 125
      nsfw_initializer/build.gradle

@ -18,7 +18,7 @@
![图片](https://github.com/devzwy/open_nsfw_android/blob/dev/img/demopic.png) ![图片](https://github.com/devzwy/open_nsfw_android/blob/dev/img/demopic.png)
### 开始使用(从1.3.7版本开始,依赖从JetPack移动到Maven仓库,可直接在项目中依赖,无需添加jetpack支持) ### 开始使用(从1.3.9版本开始,依赖从JetPack移动到Maven仓库,可直接在项目中依赖,无需添加jetpack支持)
- 开启tflite文件支持 - 开启tflite文件支持
@ -29,13 +29,16 @@
} }
} }
``` ```
- 引入依赖 - 引入依赖(lastVersion更换为最新版本,最新版本为右边图片中的数字👉[ ![Download](https://api.bintray.com/packages/devzwy/maven/nsfw/images/download.svg) ](https://bintray.com/devzwy/maven/nsfw/_latestVersion))
``` ```
//可选 快速初始化扫描器,可免去初始化代码 //可选 快速初始化扫描器,可免去初始化代码
implementation 'com.zwy.nsfw:nsfw_initializer:1.3.7' implementation 'com.zwy.nsfw:nsfw_initializer:lastVersion'
//必须 扫描器核心文件 //必须 扫描器核心文件
implementation 'com.zwy.nsfw:nsfw:1.3.7' implementation 'com.zwy.nsfw:nsfw:lastVersion'
//必须 tensorflow 支持库
implementation 'org.tensorflow:tensorflow-lite:2.1.0'
implementation 'org.tensorflow:tensorflow-lite-gpu:2.1.0'
``` ```
- 初始化 - 初始化

@ -18,7 +18,7 @@
### start use(As of version 1.3.7, dependencies are moved from jetpack to Maven repository, which can be directly dependent in the project without adding jetpack support) ### start use(As of version 1.3.9, dependencies are moved from jetpack to Maven repository, which can be directly dependent in the project without adding jetpack support)
- Open tflite support - Open tflite support
@ -29,13 +29,16 @@
} }
} }
``` ```
- Dependencies - Dependencies [ ![Download](https://api.bintray.com/packages/devzwy/maven/nsfw/images/download.svg) ](https://bintray.com/devzwy/maven/nsfw/_latestVersion)
``` ```
//Optional Quick initialization of scanner, can avoid initialization code //Optional Quick initialization of scanner, can avoid initialization code
implementation 'com.zwy.nsfw:nsfw_initializer:1.3.7' implementation 'com.zwy.nsfw:nsfw_initializer:lastVersion'
//must Scanner core file //must Scanner core file
implementation 'com.zwy.nsfw:nsfw:1.3.7' implementation 'com.zwy.nsfw:nsfw:lastVersion'
//must tensorflow
implementation 'org.tensorflow:tensorflow-lite:2.1.0'
implementation 'org.tensorflow:tensorflow-lite-gpu:2.1.0'
``` ```
- Initialization - Initialization

@ -10,8 +10,8 @@ android {
applicationId "com.zww.sample" applicationId "com.zww.sample"
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 30 targetSdkVersion 30
versionCode 137 versionCode 139
versionName "1.3.7" versionName "$libVersion"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
} }
@ -53,9 +53,12 @@ dependencies {
implementation 'com.github.bumptech.glide:glide:4.11.0' implementation 'com.github.bumptech.glide:glide:4.11.0'
kapt 'com.github.bumptech.glide:compiler:4.11.0' kapt 'com.github.bumptech.glide:compiler:4.11.0'
// implementation 'com.zwy.nsfw:nsfw_initializer:1.3.7'
// implementation 'com.zwy.nsfw:nsfw:1.3.7'
implementation project(path: ':nsfw_initializer') implementation 'com.zwy.nsfw:nsfw_initializer:1.3.9'
implementation project(path: ':nsfw') implementation 'com.zwy.nsfw:nsfw:1.3.9'
implementation 'org.tensorflow:tensorflow-lite:2.1.0'
implementation 'org.tensorflow:tensorflow-lite-gpu:2.1.0'
// implementation project(path: ':nsfw_initializer')
// implementation project(path: ':nsfw')
} }

@ -1,5 +1,6 @@
buildscript { buildscript {
ext.kotlin_version = '1.3.72' ext.kotlin_version = '1.3.72'
ext.libVersion = '1.3.9'
repositories { repositories {
google() google()
jcenter() jcenter()
@ -8,7 +9,9 @@ buildscript {
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.0.0' classpath 'com.android.tools.build:gradle:4.0.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "guru.stefma.bintrayrelease:bintrayrelease:1.0.0" classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.9.18"
} }
} }
@ -18,6 +21,12 @@ allprojects {
jcenter() jcenter()
mavenCentral() mavenCentral()
} }
tasks.withType(Javadoc) {
options.addStringOption('Xdoclint:none', '-quiet')
options.addStringOption('encoding', 'UTF-8')
options.encoding = "GBK"
}
} }
task clean(type: Delete) { task clean(type: Delete) {

@ -1,7 +1,9 @@
apply plugin: 'com.android.library' apply plugin: 'com.android.library'
apply plugin: 'kotlin-android' apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-android-extensions'
apply plugin: "guru.stefma.bintrayrelease" apply plugin: 'com.github.dcendents.android-maven'
apply plugin: 'com.jfrog.bintray'
apply plugin: 'org.jetbrains.dokka'
android { android {
compileSdkVersion 30 compileSdkVersion 30
buildToolsVersion "30.0.2" buildToolsVersion "30.0.2"
@ -9,8 +11,8 @@ android {
defaultConfig { defaultConfig {
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 30 targetSdkVersion 30
versionCode 137 versionCode 139
versionName "1.3.7" versionName "$libVersion"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro" consumerProguardFiles "consumer-rules.pro"
@ -22,6 +24,15 @@ android {
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
} }
} }
sourceSets {
main {
java {
include '**/*.java'
include '**/*.kt'
}
}
}
} }
dependencies { dependencies {
@ -37,18 +48,101 @@ dependencies {
implementation 'org.tensorflow:tensorflow-lite-gpu:2.1.0' implementation 'org.tensorflow:tensorflow-lite-gpu:2.1.0'
} }
version = "1.3.7" version = "$libVersion"
group = "com.zwy.nsfw" //group = "com.zwy.nsfw"
publish { //publish {
userOrg = 'devzwy' // userOrg = 'devzwy'
repoName = 'maven' // repoName = 'maven'
artifactId = 'nsfw' // artifactId = 'nsfw'
desc = 'android端离线鉴黄库' // desc = 'android端离线鉴黄库'
website = 'https://github.com/devzwy' // website = 'https://github.com/devzwy'
//}
//
//tasks.withType(Javadoc) {//
// options.addStringOption('Xdoclint:none', '-quiet')
// options.addStringOption('encoding', 'UTF-8')
// options.addStringOption('charSet', 'UTF-8')
//}
def siteUrl = 'https://github.com/devzwy/open_nsfw_android' // (GitHub地址)
def gitUrl = 'https://github.com/devzwy/open_nsfw_android.git' // Git仓库的url 便
group = "com.zwy.nsfw" // ****groupId , com.squareup.okhttp3:okhttp:3.4.1com.squareup.okhttp3部分
install {
repositories.mavenInstaller {
pom {
project {
packaging 'aar'
name 'nsfw' //
url siteUrl
licenses {
license {
name = 'The Apache Software License, Version 2.0'
url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
}
}
developers {
developer {
id 'z' //
name 'Jason' //
email 'dev_zwy@aliyun.com' //
}
}
scm {
connection gitUrl
developerConnection gitUrl
url siteUrl
}
}
}
}
}
task generateSourcesJar(type: Jar) {
group = 'jar'
from android.sourceSets.main.java.srcDirs
classifier = 'sources'
}
task sourcesJar(type: Jar) {
from android.sourceSets.main.java.srcDirs
classifier = 'sources'
}
task javadoc(type: Javadoc) {
source = android.sourceSets.main.java.srcDirs
options.encoding = "UTF-8"
classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
}
task javadocJar(type: Jar, dependsOn: javadoc) {
classifier = 'javadoc'
from javadoc.destinationDir
}
task dokkaJavadoc(type: org.jetbrains.dokka.gradle.DokkaTask) {
outputFormat = 'javadoc'
outputDirectory = javadoc.destinationDir
}
task generateJavadoc(type: Jar, dependsOn: dokkaJavadoc) {
group = 'jar'
classifier = 'javadoc'
from javadoc.destinationDir
}
artifacts {
archives generateJavadoc //javadocJar
archives generateSourcesJar //sourcesJar
} }
tasks.withType(Javadoc) {// Properties properties = new Properties()
options.addStringOption('Xdoclint:none', '-quiet') properties.load(project.rootProject.file('local.properties').newDataInputStream())
options.addStringOption('encoding', 'UTF-8') bintray {
options.addStringOption('charSet', 'UTF-8') user = properties.getProperty("bintray.user") // local.properties bintray.user
key = properties.getProperty("bintray.apikey") // local.properties bintray.apikey
configurations = ['archives']
pkg {
repo = "maven" //(****)bintray中自己新建仓库的名字
name = "nsfw" //****JCenter上的项目名字com.squareup.okhttp3:okhttp:3.4.1okhttp
websiteUrl = siteUrl
vcsUrl = gitUrl
licenses = ["Apache-2.0"]
publish = true
desc = 'android端离线鉴黄库'
}
} }

@ -1,7 +1,9 @@
apply plugin: 'com.android.library' apply plugin: 'com.android.library'
apply plugin: 'kotlin-android' apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-android-extensions'
apply plugin: "guru.stefma.bintrayrelease" apply plugin: 'com.github.dcendents.android-maven'
apply plugin: 'com.jfrog.bintray'
apply plugin: 'org.jetbrains.dokka'
android { android {
compileSdkVersion 30 compileSdkVersion 30
buildToolsVersion "30.0.2" buildToolsVersion "30.0.2"
@ -9,8 +11,8 @@ android {
defaultConfig { defaultConfig {
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 30 targetSdkVersion 30
versionCode 137 versionCode 139
versionName "1.3.7" versionName "$libVersion"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro" consumerProguardFiles "consumer-rules.pro"
@ -22,6 +24,15 @@ android {
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
} }
} }
sourceSets {
main {
java {
include '**/*.java'
include '**/*.kt'
}
}
}
} }
dependencies { dependencies {
@ -36,18 +47,102 @@ dependencies {
} }
version = "1.3.7" //group = "com.zwy.nsfw"
group = "com.zwy.nsfw" //publish {
publish { // userOrg = 'devzwy'
userOrg = 'devzwy' // repoName = 'maven'
repoName = 'maven' // artifactId = 'nsfw_initializer'
artifactId = 'nsfw_initializer' // desc = 'android端离线鉴黄库快速初始化库'
desc = 'android端离线鉴黄库快速初始化库' // website = 'https://github.com/devzwy'
website = 'https://github.com/devzwy' //}
//
//tasks.withType(Javadoc) {//
// options.addStringOption('Xdoclint:none', '-quiet')
// options.addStringOption('encoding', 'UTF-8')
// options.addStringOption('charSet', 'UTF-8')
//}
version = "$libVersion"
def siteUrl = 'https://github.com/devzwy/open_nsfw_android' // (GitHub地址)
def gitUrl = 'https://github.com/devzwy/open_nsfw_android.git' // Git仓库的url 便
group = "com.zwy.nsfw" // ****groupId , com.squareup.okhttp3:okhttp:3.4.1com.squareup.okhttp3部分
install {
repositories.mavenInstaller {
pom {
project {
packaging 'aar'
name 'nsfw_initializer' //
url siteUrl
licenses {
license {
name = 'The Apache Software License, Version 2.0'
url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
}
}
developers {
developer {
id 'z' //
name 'Jason' //
email 'dev_zwy@aliyun.com' //
}
}
scm {
connection gitUrl
developerConnection gitUrl
url siteUrl
}
}
}
}
}
task generateSourcesJar(type: Jar) {
group = 'jar'
from android.sourceSets.main.java.srcDirs
classifier = 'sources'
} }
tasks.withType(Javadoc) {// task sourcesJar(type: Jar) {
options.addStringOption('Xdoclint:none', '-quiet') from android.sourceSets.main.java.srcDirs
options.addStringOption('encoding', 'UTF-8') classifier = 'sources'
options.addStringOption('charSet', 'UTF-8') }
task javadoc(type: Javadoc) {
source = android.sourceSets.main.java.srcDirs
options.encoding = "UTF-8"
classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
}
task javadocJar(type: Jar, dependsOn: javadoc) {
classifier = 'javadoc'
from javadoc.destinationDir
}
task dokkaJavadoc(type: org.jetbrains.dokka.gradle.DokkaTask) {
outputFormat = 'javadoc'
outputDirectory = javadoc.destinationDir
}
task generateJavadoc(type: Jar, dependsOn: dokkaJavadoc) {
group = 'jar'
classifier = 'javadoc'
from javadoc.destinationDir
}
artifacts {
archives generateJavadoc //javadocJar
archives generateSourcesJar //sourcesJar
}
Properties properties = new Properties()
properties.load(project.rootProject.file('local.properties').newDataInputStream())
bintray {
user = properties.getProperty("bintray.user") // local.properties bintray.user
key = properties.getProperty("bintray.apikey") // local.properties bintray.apikey
configurations = ['archives']
pkg {
repo = "maven" //(****)bintray中自己新建仓库的名字
name = "nsfw_initializer" //****JCenter上的项目名字com.squareup.okhttp3:okhttp:3.4.1okhttp
websiteUrl = siteUrl
vcsUrl = gitUrl
licenses = ["Apache-2.0"]
publish = true
desc = 'android端离线鉴黄库快速初始化库'
}
} }
Loading…
Cancel
Save