diff --git a/unifiednlp-api/build.gradle b/unifiednlp-api/build.gradle index f57ea50..ecec943 100644 --- a/unifiednlp-api/build.gradle +++ b/unifiednlp-api/build.gradle @@ -20,15 +20,11 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:1.0.0' - classpath 'com.github.dcendents:android-maven-plugin:1.2' } } apply plugin: 'com.android.library' -apply plugin: 'com.github.dcendents.android-maven' - -group = 'org.microg' -version = '1.4-SNAPSHOT' +apply from: 'gradle-mvn-push.gradle' android { compileSdkVersion 22 diff --git a/unifiednlp-api/gradle-mvn-push.gradle b/unifiednlp-api/gradle-mvn-push.gradle new file mode 100644 index 0000000..f5f4129 --- /dev/null +++ b/unifiednlp-api/gradle-mvn-push.gradle @@ -0,0 +1,114 @@ +/* + * Copyright 2013 Chris Banes + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +apply plugin: 'maven' +apply plugin: 'signing' + +def isReleaseBuild() { + return VERSION_NAME.contains("SNAPSHOT") == false +} + +def getReleaseRepositoryUrl() { + return hasProperty('RELEASE_REPOSITORY_URL') ? RELEASE_REPOSITORY_URL + : "https://oss.sonatype.org/service/local/staging/deploy/maven2/" +} + +def getSnapshotRepositoryUrl() { + return hasProperty('SNAPSHOT_REPOSITORY_URL') ? SNAPSHOT_REPOSITORY_URL + : "https://oss.sonatype.org/content/repositories/snapshots/" +} + +def getRepositoryUsername() { + return hasProperty('NEXUS_USERNAME') ? NEXUS_USERNAME : "" +} + +def getRepositoryPassword() { + return hasProperty('NEXUS_PASSWORD') ? NEXUS_PASSWORD : "" +} + +afterEvaluate { project -> + uploadArchives { + repositories { + mavenDeployer { + beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) } + + pom.groupId = GROUP + pom.artifactId = POM_ARTIFACT_ID + pom.version = VERSION_NAME + + repository(url: getReleaseRepositoryUrl()) { + authentication(userName: getRepositoryUsername(), password: getRepositoryPassword()) + } + snapshotRepository(url: getSnapshotRepositoryUrl()) { + authentication(userName: getRepositoryUsername(), password: getRepositoryPassword()) + } + + pom.project { + name POM_NAME + packaging POM_PACKAGING + description POM_DESCRIPTION + url POM_URL + + scm { + url POM_SCM_URL + connection POM_SCM_CONNECTION + developerConnection POM_SCM_DEV_CONNECTION + } + + licenses { + license { + name POM_LICENCE_NAME + url POM_LICENCE_URL + distribution POM_LICENCE_DIST + } + } + + developers { + developer { + id POM_DEVELOPER_ID + name POM_DEVELOPER_NAME + } + } + } + } + } + } + + signing { + required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") } + sign configurations.archives + } + + task androidJavadocs(type: Javadoc) { + source = android.sourceSets.main.java.srcDirs + classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) + } + + task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) { + classifier = 'javadoc' + from androidJavadocs.destinationDir + } + + task androidSourcesJar(type: Jar) { + classifier = 'sources' + from android.sourceSets.main.java.sourceFiles + } + + artifacts { + archives androidSourcesJar + archives androidJavadocsJar + } +} diff --git a/unifiednlp-api/gradle.properties b/unifiednlp-api/gradle.properties new file mode 100644 index 0000000..d8f7b6c --- /dev/null +++ b/unifiednlp-api/gradle.properties @@ -0,0 +1,22 @@ +GROUP=org.microg +POM_ARTIFACT_ID=unifiednlp-api +VERSION_NAME=1.3.2 + +POM_NAME=µg UnifiedNlp API +POM_DESCRIPTION=API interfaces and helpers to create backends for UnifiedNlp + +POM_PACKAGING=aar + +POM_URL=https://github.com/microg/android_external_UnifiedNlpApi + +POM_SCM_URL=https://github.com/microg/android_external_UnifiedNlpApi +POM_SCM_CONNECTION=scm:git@github.com:microg/android_external_UnifiedNlpApi.git +POM_SCM_DEV_CONNECTION=scm:git@github.com:microg/android_external_UnifiedNlpApi.git + +POM_LICENCE_NAME=The Apache Software License, Version 2.0 +POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt +POM_LICENCE_DIST=repo + +POM_DEVELOPER_ID=mar-v-in +POM_DEVELOPER_NAME=Marvin W + diff --git a/unifiednlp-api/src/main/java/org/microg/nlp/api/WiFiBackendHelper.java b/unifiednlp-api/src/main/java/org/microg/nlp/api/WiFiBackendHelper.java index bdae78d..5cba299 100644 --- a/unifiednlp-api/src/main/java/org/microg/nlp/api/WiFiBackendHelper.java +++ b/unifiednlp-api/src/main/java/org/microg/nlp/api/WiFiBackendHelper.java @@ -27,6 +27,7 @@ import java.util.HashSet; import java.util.List; +import java.util.Locale; import java.util.Set; /** @@ -129,7 +130,7 @@ private synchronized boolean loadWiFis() { currentDataUsed = false; List scanResults = wifiManager.getScanResults(); for (ScanResult scanResult : scanResults) { - if (ignoreNomap && scanResult.SSID.toLowerCase().endsWith("_nomap")) continue; + if (ignoreNomap && scanResult.SSID.toLowerCase(Locale.US).endsWith("_nomap")) continue; wiFis.add(new WiFi(scanResult.BSSID, scanResult.level)); } if (state == State.DISABLING)