Merge tag '0.1.1-alpha.01' into develop

.gitignore

@@ -32,3 +32,4 @@ google-services.json
 # Android Profiling
 *.hprof
 /app/release
+local-source/com/norman/webviewup/

app/build.gradle

@@ -51,8 +51,8 @@ android {
 
 dependencies {
     implementation 'androidx.appcompat:appcompat:1.3.0'
-//    implementation 'io.github.jonanorman.android.webviewup:core:0.1.0'
-//    implementation 'io.github.jonanorman.android.webviewup:download-source:0.1.0'
+//    implementation 'com.norman.webviewup:core:0.1.1-alpha.01'
+//    implementation 'com.norman.webviewup:download-source:0.1.0'
     implementation project(":core")
     implementation project(':download-source')
 

build.gradle

@@ -18,6 +18,7 @@ allprojects {
         maven {
             url 'https://s01.oss.sonatype.org/content/repositories/snapshots/'
         }
+        maven { url = uri("${rootProject.projectDir}/local-source") }
     }
 }
 

core/gradle.properties

@@ -1,3 +1,3 @@
 MAVEN_LIB_ARTIFACTID=core
-MAVEN_LIB_VERSION=0.1.0
+MAVEN_LIB_VERSION=0.1.1-alpha.01
 MAVEN_LIB_DESCRIPTION=upgrade webview core

core/src/main/java/com/norman/webviewup/lib/WebViewUpgrade.java

@@ -72,10 +72,16 @@ public class WebViewUpgrade {
         return WebViewReplace.getReplaceWebViewVersion();
     }
 
-
     public synchronized static void upgrade(UpgradeSource webViewSource) {
+        upgrade(webViewSource, false);
+    }
+
+    public synchronized static void upgrade(UpgradeSource webViewSource, Boolean forced) {
         try {
-            if (UPGRADE_STATUS == STATUS_RUNNING || UPGRADE_STATUS == STATUS_COMPLETE) {
+            if (UPGRADE_STATUS == STATUS_RUNNING) { return; }
+            if (UPGRADE_STATUS == STATUS_COMPLETE && !forced) {
+                callProcessCallback(1.0f);
+                callCompleteCallback();
                 return;
             }
             UPGRADE_STATUS = STATUS_RUNNING;

gradle.properties

@@ -19,8 +19,7 @@ android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false
 
-
-MAVEN_LIB_GROUP=io.github.jonanorman.android.webviewup
+MAVEN_LIB_GROUP=com.norman.webviewup
 MAVEN_LIB_GIT_URL=https://github.com/JonaNorman/WebViewUpgrade
 MAVEN_LIB_LICENSE=MIT
 

publish.gradle

@@ -1,5 +1,4 @@
 apply plugin: 'maven-publish'
-apply plugin: 'signing'
 
 Properties rootLocalProperties = new Properties()
 def rootLocalPropertiesFile = project.rootProject.file('local.properties')
@@ -25,9 +24,6 @@ def getPropertyValue(key) {
     return project.ext.has(key) ? project.ext.getProperty(key) : (project.rootProject.ext.has(key)?project.rootProject.ext.getProperty(key):null)
 }
 
-def mavenUsername = getPropertyValue("MAVEN_USER_NAME")
-def mavenPassword = getPropertyValue("MAVEN_PASSWORD")
-def mavenMail = getPropertyValue("MAVEN_LIB_USER_MAIL")
 def projectGroupId = getPropertyValue('MAVEN_LIB_GROUP')
 def projectArtifactId = getPropertyValue("MAVEN_LIB_ARTIFACTID")
 def projectVersionName = getPropertyValue("MAVEN_LIB_VERSION")
@@ -35,15 +31,6 @@ def projectDescription = getPropertyValue("MAVEN_LIB_DESCRIPTION")
 def projectGitUrl = getPropertyValue("MAVEN_LIB_GIT_URL")
 def projectLicense = getPropertyValue("MAVEN_LIB_LICENSE")
 def projectLicenseUrl = projectLicense ? "https://opensource.org/licenses/${projectLicense.toString().replace(" ", "-")} " : null
-if (!mavenUsername) {
-    println('missing parameter MAVEN_USER_NAME')
-    return
-}
-
-if (!mavenPassword) {
-    println('missing parameter MAVEN_PASSWORD')
-    return
-}
 
 if (!projectGroupId) {
     println('missing parameter MAVEN_LIB_GROUP')
@@ -125,8 +112,8 @@ afterEvaluate {
                 } else {
                     artifact("$buildDir/libs/${project.getName()}.jar")
                 }
-                artifact javadocsJar
-                artifact sourcesJar
+//                artifact javadocsJar
+//                artifact sourcesJar
 
                 pom {
                     name = projectArtifactId
@@ -139,19 +126,6 @@ afterEvaluate {
                             url = projectLicenseUrl
                         }
                     }
-                    developers {
-                        developer {
-                            id = mavenUsername
-                            name = mavenUsername
-                            email = mavenMail
-                        }
-                    }
-                    // Version control info, if you're using GitHub, follow the format as seen here
-                    scm {
-                        connection = "scm:git:${projectGitUrl}"
-                        developerConnection = "scm:git:${projectGitUrl}"
-                        url = projectGitUrl
-                    }
                     withXml {
                         def dependenciesNode = asNode().appendNode('dependencies')
                         def scopes = []
@@ -200,34 +174,8 @@ afterEvaluate {
         repositories {
             maven {
                 name = projectArtifactId
-                def releasesRepoUrl = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/"
-                def snapshotsRepoUrl = "https://s01.oss.sonatype.org/content/repositories/snapshots/"
-                url = projectVersionName.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
-                credentials {
-                    username mavenUsername
-                    password mavenPassword
-                }
+                url = uri("${rootProject.projectDir}/local-source")
             }
         }
     }
-}
-
-signing {
-    def signingKeyId = getPropertyValue("MAVEN_SIGNING_KEY_ID")
-    def signingKey = getPropertyValue("MAVEN_SIGNING_KEY")
-    def signingPassword = getPropertyValue("MAVEN_SIGNING_PASSWORD")
-    if (!signingKeyId) {
-        println('missing parameter MAVEN_SIGNING_KEY_ID')
-        return
-    }
-    if (!signingKey) {
-        println('missing parameter MAVEN_SIGNING_KEY')
-        return
-    }
-    if (!signingPassword) {
-        println('missing parameter MAVEN_SIGNING_PASSWORD')
-        return
-    }
-    useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
-    sign publishing.publications
 }