bump maven things

clockbyte · Oct 11, 2021 · f156bd9 · f156bd9
1 parent 9aff12b
commit f156bd9
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 40 deletions.
diff --git a/admobadapter/maven-push.gradle b/admobadapter/maven-push.gradle
@@ -15,27 +15,13 @@
 apply plugin: 'maven'
 apply plugin: 'signing'
 
-def isReleaseBuild() {
-    return !VERSION_NAME.contains("SNAPSHOT")
-}
-
-def getReleaseRepositoryUrl() {
-    return hasProperty('RELEASE_REPOSITORY_URL') ? RELEASE_REPOSITORY_URL
+def isReleaseBuild = !VERSION_NAME.contains("SNAPSHOT")
+def releaseRepositoryUrl = 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
+def snapshotRepositoryUrl = 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 : ""
-}
+def repositoryUsername = hasProperty('NEXUS_USERNAME') ? NEXUS_USERNAME : ""
+def repositoryPassword = hasProperty('NEXUS_PASSWORD') ? NEXUS_PASSWORD : ""
 
 afterEvaluate { project ->
     uploadArchives {
@@ -47,11 +33,11 @@ afterEvaluate { project ->
                 pom.artifactId = POM_ARTIFACT_ID
                 pom.version = VERSION_NAME
 
-                repository(url: getReleaseRepositoryUrl()) {
-                    authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
+                repository(url: releaseRepositoryUrl) {
+                    authentication(userName: repositoryUsername, password: repositoryPassword)
                 }
-                snapshotRepository(url: getSnapshotRepositoryUrl()) {
-                    authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
+                snapshotRepository(url: snapshotRepositoryUrl) {
+                    authentication(userName: repositoryUsername, password: repositoryPassword)
                 }
 
                 pom.project {
@@ -86,19 +72,10 @@ afterEvaluate { project ->
     }
 
     signing {
-        required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") }
+        required { isReleaseBuild && gradle.taskGraph.hasTask("uploadArchives") }
         sign configurations.archives
     }
 
-    //task androidJavadocs(type: Javadoc) {
-    //source = android.sourceSets.main.allJava
-    //}
-
-    //task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
-    //classifier = 'javadoc'
-    //from androidJavadocs.destinationDir
-    //}
-
     task androidSourcesJar(type: Jar) {
         classifier = 'sources'
         from android.sourceSets.main.java.sourceFiles

diff --git a/admobadapter/src/main/AndroidManifest.xml b/admobadapter/src/main/AndroidManifest.xml
@@ -13,7 +13,6 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     package="com.clockbyte.admobadapter">
 
     <uses-permission android:name="android.permission.INTERNET" />

diff --git a/gradle.properties b/gradle.properties
@@ -10,18 +10,18 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-#Sun Aug 01 21:27:42 MSK 2021
-VERSION_CODE=12
-POM_DESCRIPTION=An Android library that makes it easy to integrate Admob Native ads (both Express and Advanced) into ListView/RecyclerView
-POM_LICENCE_URL=http\://www.apache.org/licenses/LICENSE-2.0.txt
+#Sun Aug 01 21:27:42 MSK 202
 org.gradle.jvmargs=-Xmx2048m -XX\:MaxPermSize\=512m -XX\:+HeapDumpOnOutOfMemoryError -Dfile.encoding\=UTF-8
-POM_SCM_CONNECTION=scm\:git@github.com\:clockbyte/admobadapter.git
 android.useAndroidX=true
 android.enableJetifier=true
+VERSION_CODE=13
+POM_DESCRIPTION=An Android library that makes it easy to integrate Admob Native ads (both Express and Advanced) into ListView/RecyclerView
+POM_LICENCE_URL=http\://www.apache.org/licenses/LICENSE-2.0.txt
+POM_SCM_CONNECTION=scm\:git@github.com\:clockbyte/admobadapter.git
 POM_DEVELOPER_ID=clockbyte
 POM_DEVELOPER_NAME=Clockbyte Team
 POM_LICENCE_DIST=repo
-VERSION_NAME=1.4.6
+VERSION_NAME=1.5.0
 GROUP=com.github.clockbyte
 POM_SCM_DEV_CONNECTION=scm\:git@github.com\:clockbyte/admobadapter.git
 POM_LICENCE_NAME=The Apache Software License, Version 2.0