diff --git a/app-sample/build.gradle b/app-sample/build.gradle index 38358d30..0ef180a6 100644 --- a/app-sample/build.gradle +++ b/app-sample/build.gradle @@ -54,48 +54,46 @@ android { } } - signingConfigs { - config { + // do not sign in CI + if (!project.hasProperty('CI')) { + signingConfigs { + config { - // skip signing in CI environment - if (project.hasProperty('CI')) { - return + final def keystoreFile = project.file('keystore.jks') + final def keystoreFilePassword = 'MARKWON_KEYSTORE_FILE_PASSWORD' + final def keystoreAlias = 'MARKWON_KEY_ALIAS' + final def keystoreAliasPassword = 'MARKWON_KEY_ALIAS_PASSWORD' + + final def properties = [ + keystoreFilePassword, + keystoreAlias, + keystoreAliasPassword + ] + + if (!keystoreFile.exists()) { + throw new IllegalStateException("No '${keystoreFile.name}' file is found.") + } + + final def missingProperties = properties.findAll { !project.hasProperty(it) } + if (!missingProperties.isEmpty()) { + throw new IllegalStateException("Missing required signing properties: $missingProperties") + } + + storeFile keystoreFile + storePassword project[keystoreFilePassword] + + keyAlias project[keystoreAlias] + keyPassword project[keystoreAliasPassword] } - - final def keystoreFile = project.file('keystore.jks') - final def keystoreFilePassword = 'MARKWON_KEYSTORE_FILE_PASSWORD' - final def keystoreAlias = 'MARKWON_KEY_ALIAS' - final def keystoreAliasPassword = 'MARKWON_KEY_ALIAS_PASSWORD' - - final def properties = [ - keystoreFilePassword, - keystoreAlias, - keystoreAliasPassword - ] - - if (!keystoreFile.exists()) { - throw new IllegalStateException("No '${keystoreFile.name}' file is found.") - } - - final def missingProperties = properties.findAll { !project.hasProperty(it) } - if (!missingProperties.isEmpty()) { - throw new IllegalStateException("Missing required signing properties: $missingProperties") - } - - storeFile keystoreFile - storePassword project[keystoreFilePassword] - - keyAlias project[keystoreAlias] - keyPassword project[keystoreAliasPassword] } - } - buildTypes { - debug { - signingConfig signingConfigs.config - } - release { - signingConfig signingConfigs.config + buildTypes { + debug { + signingConfig signingConfigs.config + } + release { + signingConfig signingConfigs.config + } } } } diff --git a/app-sample/src/main/java/io/noties/markwon/app/readme/ReadMeLinkResolver.kt b/app-sample/src/main/java/io/noties/markwon/app/readme/ReadMeLinkResolver.kt index f83f67ad..4320047c 100644 --- a/app-sample/src/main/java/io/noties/markwon/app/readme/ReadMeLinkResolver.kt +++ b/app-sample/src/main/java/io/noties/markwon/app/readme/ReadMeLinkResolver.kt @@ -7,9 +7,9 @@ import io.noties.markwon.app.utils.ReadMeUtils class ReadMeLinkResolver : LinkResolverDef() { override fun resolve(view: View, link: String) { - val matcher = ReadMeUtils.RE_REPOSITORY.matcher(link) - val url = if (matcher.matches()) { - ReadMeUtils.buildRepositoryReadMeUrl(matcher.group(1), matcher.group(2)) + val info = ReadMeUtils.parseRepository(link) + val url = if (info != null) { + ReadMeUtils.buildRepositoryReadMeUrl(info.first, info.second) } else { link } diff --git a/app-sample/src/main/java/io/noties/markwon/app/sample/ui/SampleCodeFragment.kt b/app-sample/src/main/java/io/noties/markwon/app/sample/ui/SampleCodeFragment.kt index fe4d95a5..a827f53b 100644 --- a/app-sample/src/main/java/io/noties/markwon/app/sample/ui/SampleCodeFragment.kt +++ b/app-sample/src/main/java/io/noties/markwon/app/sample/ui/SampleCodeFragment.kt @@ -57,7 +57,8 @@ class SampleCodeFragment : Fragment() { } private val sample: Sample by lazy(LazyThreadSafetyMode.NONE) { - arguments!!.getParcelable(ARG_SAMPLE) + val temp: Sample = (arguments!!.getParcelable(ARG_SAMPLE))!! + temp } companion object { diff --git a/app-sample/src/main/java/io/noties/markwon/app/sample/ui/SampleFragment.kt b/app-sample/src/main/java/io/noties/markwon/app/sample/ui/SampleFragment.kt index f07f6de6..0f4f61e0 100644 --- a/app-sample/src/main/java/io/noties/markwon/app/sample/ui/SampleFragment.kt +++ b/app-sample/src/main/java/io/noties/markwon/app/sample/ui/SampleFragment.kt @@ -114,7 +114,8 @@ class SampleFragment : Fragment() { } private val sample: Sample by lazy(LazyThreadSafetyMode.NONE) { - (arguments!!.getParcelable(ARG_SAMPLE)) + val temp: Sample = (arguments!!.getParcelable(ARG_SAMPLE))!! + temp } companion object { diff --git a/app-sample/src/main/java/io/noties/markwon/app/utils/ReadMeUtils.kt b/app-sample/src/main/java/io/noties/markwon/app/utils/ReadMeUtils.kt index f603bd17..907f35e5 100644 --- a/app-sample/src/main/java/io/noties/markwon/app/utils/ReadMeUtils.kt +++ b/app-sample/src/main/java/io/noties/markwon/app/utils/ReadMeUtils.kt @@ -1,6 +1,7 @@ package io.noties.markwon.app.utils import android.net.Uri +import android.text.TextUtils import java.util.regex.Pattern object ReadMeUtils { @@ -10,7 +11,7 @@ object ReadMeUtils { private val RE_FILE = Pattern.compile("^https:\\/\\/github\\.com\\/([\\w-.]+?)\\/([\\w-.]+?)\\/(?:blob|raw)\\/([\\w-.]+?)\\/(.+)\$") @Suppress("RegExpRedundantEscape") - val RE_REPOSITORY: Pattern = Pattern.compile("^https:\\/\\/github.com\\/([\\w-.]+?)\\/([\\w-.]+?)\\/*\$") + private val RE_REPOSITORY: Pattern = Pattern.compile("^https:\\/\\/github.com\\/([\\w-.]+?)\\/([\\w-.]+?)\\/*\$") data class GithubInfo( val username: String, @@ -19,6 +20,20 @@ object ReadMeUtils { val fileName: String ) + fun parseRepository(url: String): Pair? { + val matcher = RE_REPOSITORY.matcher(url) + val (user, repository) = if (matcher.matches()) { + Pair(matcher.group(1), matcher.group(2)) + } else { + Pair(null, null) + } + return if (TextUtils.isEmpty(user) || TextUtils.isEmpty(repository)) { + null + } else { + Pair(user!!, repository!!) + } + } + fun parseInfo(data: Uri?): GithubInfo? { if (data == null) { @@ -31,10 +46,10 @@ object ReadMeUtils { } return GithubInfo( - username = matcher.group(1), - repository = matcher.group(2), - branch = matcher.group(3), - fileName = matcher.group(4) + username = matcher.group(1)!!, + repository = matcher.group(2)!!, + branch = matcher.group(3)!!, + fileName = matcher.group(4)!! ) } diff --git a/build.gradle b/build.gradle index d91e7953..16b72580 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,6 @@ buildscript { jcenter() } dependencies { - // on `3.5.3` tests are not run from CLI classpath 'com.android.tools.build:gradle:4.0.1' classpath 'com.github.ben-manes:gradle-versions-plugin:0.28.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" @@ -50,9 +49,9 @@ if (hasProperty('local')) { ext { config = [ - 'build-tools' : '28.0.3', - 'compile-sdk' : 28, - 'target-sdk' : 28, + 'build-tools' : '29.0.3', + 'compile-sdk' : 29, + 'target-sdk' : 29, 'min-sdk' : 16, 'push-aar-gradle': 'https://raw.githubusercontent.com/noties/gradle-mvn-push/master/gradle-mvn-push-aar.gradle' ] diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 87b738cb..f3d88b1c 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 76c5eda1..4e1cc9db 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Wed Jun 17 17:05:04 MSK 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip diff --git a/gradlew b/gradlew index af6708ff..2fe81a7d 100755 --- a/gradlew +++ b/gradlew @@ -1,5 +1,21 @@ #!/usr/bin/env sh +# +# Copyright 2015 the original author or authors. +# +# 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 +# +# https://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. +# + ############################################################################## ## ## Gradle start up script for UN*X @@ -28,7 +44,7 @@ APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m"' +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" @@ -109,8 +125,8 @@ if $darwin; then GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" fi -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` JAVACMD=`cygpath --unix "$JAVACMD"` @@ -138,19 +154,19 @@ if $cygwin ; then else eval `echo args$i`="\"$arg\"" fi - i=$((i+1)) + i=`expr $i + 1` done case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; esac fi @@ -159,14 +175,9 @@ save () { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " } -APP_ARGS=$(save "$@") +APP_ARGS=`save "$@"` # Collect all arguments for the java command, following the shell quoting and substitution rules eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi - exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 0f8d5937..24467a14 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,3 +1,19 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome