Skip to content

Commit

Permalink
fix conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
devilsen committed Aug 29, 2021
2 parents 6372176 + daab74b commit 04b55f3
Show file tree
Hide file tree
Showing 5 changed files with 132 additions and 6 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ C++ port of ZXing for Android
### 使用
在gradle中:
``` groovy
// 改为小写了,这样显得更整齐一些
implementation 'me.devilsen:czxing:1.0.17'
// 迁移至 Maven Central
implementation 'io.github.devilsen:czxing:1.1.0'
```
建议加入abiFilters
```gradle
Expand All @@ -28,7 +28,7 @@ defaultConfig {
```
如果下载失败,可以在根目录加入阿里云的镜像
```gradle
maven { url 'https://maven.aliyun.com/repository/jcenter' }
maven { url 'https://maven.aliyun.com/repository/central' }
```

#### 1. 直接使用
Expand Down
7 changes: 7 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ project.ext {
buildscript {
repositories {
maven { url 'https://maven.aliyun.com/repository/jcenter' }
maven { url 'https://maven.aliyun.com/repository/central' }
jcenter()
mavenCentral()
google()
}
dependencies {
Expand All @@ -33,12 +36,16 @@ buildscript {
// classpath 'com.tencent.bugly:symtabfileuploader:2.2.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.4.10.2"
}
}

allprojects {
repositories {
maven { url 'https://maven.aliyun.com/repository/jcenter' }
maven { url 'https://maven.aliyun.com/repository/central' }
jcenter()
mavenCentral()
google()
}
}
Expand Down
6 changes: 4 additions & 2 deletions czxing/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
apply plugin: 'com.android.library'
apply plugin: 'com.github.dcendents.android-maven'
//apply plugin: 'com.github.dcendents.android-maven'

android {
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
ndkVersion rootProject.ext.ndkVersion
versionCode 35
versionName "1.1.0"

externalNativeBuild {
cmake {
Expand Down Expand Up @@ -52,4 +54,4 @@ dependencies {
androidTestImplementation rootProject.ext.testespresso
}

apply from: "bintrayUpload.gradle"
apply from: "public-maven.gradle"
117 changes: 117 additions & 0 deletions czxing/public-maven.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
apply plugin: 'maven-publish'
apply plugin: 'signing'

// load properties
Properties properties = new Properties()
File projectPropertiesFile = project.file("project.properties");
if (projectPropertiesFile.exists()) {
properties.load(projectPropertiesFile.newDataInputStream())
}

// read properties
def projectName = properties.getProperty("project.name")
def projectGroupId = properties.getProperty("project.groupId")
def projectArtifactId = properties.getProperty("project.artifactId")
def projectVersionName = android.defaultConfig.versionName
def projectPackaging = properties.getProperty("project.packaging")
def projectSiteUrl = properties.getProperty("project.siteUrl")
def projectGitUrl = properties.getProperty("project.gitUrl")

def developerId = properties.getProperty("developer.id")
def developerName = properties.getProperty("developer.name")
def developerEmail = properties.getProperty("developer.email")

def signingKeyId = properties.getProperty("signing.keyId")
def signingPassword = properties.getProperty("signing.password")
def signingSecretKeyRingFile = properties.getProperty("signing.secretKeyRingFile")

def ossrhUsername = properties.getProperty("ossrh.username")
def ossrhPassword = properties.getProperty("ossrh.password")

def javadocName = properties.getProperty("javadoc.name")

task androidSourcesJar(type: Jar) {
classifier = 'sources'
from android.sourceSets.main.java.source

exclude "**/R.class"
exclude "**/BuildConfig.class"
}

publishing {
publications {
release(MavenPublication) {
groupId projectGroupId
artifactId projectArtifactId
version projectVersionName

artifact("$buildDir/outputs/aar/${project.getName()}-release.aar")

pom {
name = projectArtifactId
description = 'zxing for android'
url = 'https://github.com/devilsen/CZXing'
licenses {
license {
name = 'The Apache Software License, Version 2.0'
url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
}
}
developers {
developer {
id = developerId
name = developerName
email = developerEmail
}
}
scm {
connection = 'scm:git:github.com/devilsen/CZXing.git'
developerConnection = 'scm:git:ssh://github.com/devilsen/CZXing.git'
url = 'https://github.com/devilsen/CZXing/tree/master'
}
// A slightly hacky fix so that your POM will include any transitive dependencies
// that your library builds upon
withXml {
def dependenciesNode = asNode().appendNode('dependencies')

project.configurations.implementation.allDependencies.each {
def dependencyNode = dependenciesNode.appendNode('dependency')
dependencyNode.appendNode('groupId', it.group)
dependencyNode.appendNode('artifactId', it.name)
dependencyNode.appendNode('version', it.version)
}
}
}
}
}
repositories {
// The repository to publish to, Sonatype/MavenCentral
maven {
// This is an arbitrary name, you may also use "mavencentral" or
// any other name that's descriptive for you
name = "mavencentral"

def releasesRepoUrl = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/"
def snapshotsRepoUrl = "https://s01.oss.sonatype.org/content/repositories/snapshots"
// You only need this if you want to publish snapshots, otherwise just set the URL
// to the release repo directly
url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl

// The username and password we've fetched earlier
credentials {
username ossrhUsername
password ossrhPassword
}
}
}
}

ext["signing.keyId"] = signingKeyId
ext["signing.password"] = signingPassword
ext["signing.secretKeyRingFile"] = signingSecretKeyRingFile
ext["ossrhUsername"] = ossrhUsername
ext["ossrhPassword"] = ossrhPassword

signing {
sign publishing.publications
}
2 changes: 1 addition & 1 deletion sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ dependencies {

debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.2'
implementation project(':czxing')
// implementation 'me.devilsen:czxing:1.0.17'
// implementation 'io.github.devilsen:czxing:1.1.0'

testImplementation rootProject.ext.junit
androidTestImplementation rootProject.ext.testrunner
Expand Down

0 comments on commit 04b55f3

Please sign in to comment.