diff --git a/.travis.yml b/.travis.yml index e020b62..851bbab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,22 +2,15 @@ language: android jdk: oraclejdk8 android: components: - - build-tools-25.0.2 - - android-25 - - extra-google-google_play_services - - extra-google-m2repository - - extra-android-m2repository -install: -- echo y | android update sdk -u -a -t tools -- echo y | android update sdk -u -a -t platform-tools -- echo y | android update sdk -u -a -t build-tools-25.0.2 -- echo y | android update sdk -u -a -t android-25 -- echo y | android update sdk -u -a -t extra-google-m2repository -- echo y | android update sdk -u -a -t extra-android-m2repository + - tools + - platform-tools + - extra-google-google_play_services + - extra-google-m2repository + - extra-android-m2repository before_install: -- mkdir "$ANDROID_HOME/licenses" || true -- echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license" -- echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license" + - touch $HOME/.android/repositories.cfg + - yes | sdkmanager "platforms;android-29" + - yes | sdkmanager "build-tools;29.0.0" script: - "./gradlew build" before_cache: @@ -36,4 +29,4 @@ deploy: provider: script script: "./gradlew bintrayUpload" on: - tags: true \ No newline at end of file + tags: true diff --git a/a3utilities/build.gradle b/a3utilities/build.gradle index ba4d9a2..f1e48ff 100644 --- a/a3utilities/build.gradle +++ b/a3utilities/build.gradle @@ -6,14 +6,13 @@ group = 'at.allaboutapps.a3utilities' version = '1.0.3' android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" + compileSdkVersion 30 archivesBaseName = 'a3utilities' defaultConfig { minSdkVersion 16 - targetSdkVersion 25 + targetSdkVersion 30 } } @@ -63,5 +62,5 @@ artifacts { } dependencies { - compile "com.android.support:recyclerview-v7:$supportLibVersion" -} \ No newline at end of file + implementation 'androidx.recyclerview:recyclerview:1.1.0' +} diff --git a/a3utilities/src/main/java/at/allaboutapps/a3utilities/A3Assets.java b/a3utilities/src/main/java/at/allaboutapps/a3utilities/A3Assets.java index fb0e4b0..d88e488 100755 --- a/a3utilities/src/main/java/at/allaboutapps/a3utilities/A3Assets.java +++ b/a3utilities/src/main/java/at/allaboutapps/a3utilities/A3Assets.java @@ -2,10 +2,10 @@ import android.content.Context; import android.graphics.BitmapFactory; -import android.support.annotation.IntRange; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import android.util.Log; +import androidx.annotation.IntRange; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.io.IOException; import java.io.InputStream; diff --git a/a3utilities/src/main/java/at/allaboutapps/a3utilities/A3Device.java b/a3utilities/src/main/java/at/allaboutapps/a3utilities/A3Device.java index 8b1b2e7..27a8baa 100755 --- a/a3utilities/src/main/java/at/allaboutapps/a3utilities/A3Device.java +++ b/a3utilities/src/main/java/at/allaboutapps/a3utilities/A3Device.java @@ -4,10 +4,11 @@ import android.graphics.Point; import android.net.ConnectivityManager; import android.os.Build; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import android.util.TypedValue; import android.view.WindowManager; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.RequiresPermission; /** Utilities for version checks and pixel sizes. */ public class A3Device { @@ -70,6 +71,7 @@ public static boolean isApiLevelSupported(int apiLevel) { * @param ctx the application context * @return the current network state, true if online, false if ctx == null or otherwise. */ + @RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE) public static boolean isOnline(@Nullable Context ctx) { if (ctx == null) { diff --git a/a3utilities/src/main/java/at/allaboutapps/a3utilities/A3Intent.java b/a3utilities/src/main/java/at/allaboutapps/a3utilities/A3Intent.java index 31f4c0e..6933c4a 100644 --- a/a3utilities/src/main/java/at/allaboutapps/a3utilities/A3Intent.java +++ b/a3utilities/src/main/java/at/allaboutapps/a3utilities/A3Intent.java @@ -4,10 +4,10 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.RequiresPermission; import android.text.TextUtils; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.RequiresPermission; /** * This class provides some methods to create standard intents for email, phone, web and methods to diff --git a/a3utilities/src/main/java/at/allaboutapps/a3utilities/A3SoftInput.java b/a3utilities/src/main/java/at/allaboutapps/a3utilities/A3SoftInput.java index e6701d7..21e0aeb 100755 --- a/a3utilities/src/main/java/at/allaboutapps/a3utilities/A3SoftInput.java +++ b/a3utilities/src/main/java/at/allaboutapps/a3utilities/A3SoftInput.java @@ -2,9 +2,9 @@ import android.app.Activity; import android.content.Context; -import android.support.annotation.NonNull; import android.view.View; import android.view.inputmethod.InputMethodManager; +import androidx.annotation.NonNull; /** Show or hide the keyboard. */ public class A3SoftInput { diff --git a/a3utilitiesproject/build.gradle b/a3utilitiesproject/build.gradle index a10778c..4cd09b1 100644 --- a/a3utilitiesproject/build.gradle +++ b/a3utilitiesproject/build.gradle @@ -1,15 +1,14 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" + compileSdkVersion 30 defaultConfig { applicationId "at.allaboutapps.a3utilitiesproject" minSdkVersion 19 - targetSdkVersion 25 + targetSdkVersion 30 versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } buildTypes { release { @@ -20,13 +19,12 @@ android { } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile project(':a3utilities') - compile 'com.android.support:appcompat-v7:25.3.1' - compile 'com.android.support.constraint:constraint-layout:1.0.2' - compile 'com.android.support:design:25.3.1' - testCompile 'junit:junit:4.12' + implementation project(':a3utilities') + implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'com.google.android.material:material:1.2.0' + testImplementation 'junit:junit:4.13' } diff --git a/a3utilitiesproject/src/main/java/at/allaboutapps/a3utilitiesproject/ExampleActivity.java b/a3utilitiesproject/src/main/java/at/allaboutapps/a3utilitiesproject/ExampleActivity.java index 1617683..1d8beda 100644 --- a/a3utilitiesproject/src/main/java/at/allaboutapps/a3utilitiesproject/ExampleActivity.java +++ b/a3utilitiesproject/src/main/java/at/allaboutapps/a3utilitiesproject/ExampleActivity.java @@ -1,8 +1,8 @@ package at.allaboutapps.a3utilitiesproject; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import at.allaboutapps.a3utilities.A3Device; import at.allaboutapps.a3utilitiesproject.vh.ExampleActivityViewHolder; diff --git a/a3utilitiesproject/src/main/res/layout/activity_example.xml b/a3utilitiesproject/src/main/res/layout/activity_example.xml index c538da6..d5383b8 100644 --- a/a3utilitiesproject/src/main/res/layout/activity_example.xml +++ b/a3utilitiesproject/src/main/res/layout/activity_example.xml @@ -1,5 +1,5 @@ - - + diff --git a/build.gradle b/build.gradle index e5225cd..3f33e9a 100644 --- a/build.gradle +++ b/build.gradle @@ -3,10 +3,11 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.1' - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2' + classpath 'com.android.tools.build:gradle:4.0.1' + classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.1' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -16,13 +17,10 @@ buildscript { allprojects { repositories { jcenter() + google() } } -ext { - supportLibVersion = "25.3.1" -} - task clean(type: Delete) { delete rootProject.buildDir } diff --git a/gradle.properties b/gradle.properties index aac7c9b..5abb0d3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,6 +9,7 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. +android.useAndroidX=true org.gradle.jvmargs=-Xmx1536m # When configured, Gradle will run in incubating parallel mode. diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 13372ae..e708b1c 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 c0eac89..bca17f3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Fri Apr 21 13:51:20 CEST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip diff --git a/gradlew b/gradlew index 9d82f78..4f906e0 100755 --- a/gradlew +++ b/gradlew @@ -1,4 +1,20 @@ -#!/usr/bin/env bash +#!/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. +# ############################################################################## ## @@ -6,20 +22,38 @@ ## ############################################################################## -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null 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" "-Xms64m"' + # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" -warn ( ) { +warn () { echo "$*" } -die ( ) { +die () { echo echo "$*" echo @@ -30,6 +64,7 @@ die ( ) { cygwin=false msys=false darwin=false +nonstop=false case "`uname`" in CYGWIN* ) cygwin=true @@ -40,28 +75,14 @@ case "`uname`" in MINGW* ) msys=true ;; + NONSTOP* ) + nonstop=true + ;; esac -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then @@ -85,7 +106,7 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then MAX_FD_LIMIT=`ulimit -H -n` if [ $? -eq 0 ] ; then if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then @@ -105,10 +126,11 @@ 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"` # We build the pattern for arguments to be converted via cygpath @@ -134,27 +156,30 @@ 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 -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " } -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" +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" -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index aec9973..ac1b06f 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 @@ -8,20 +24,23 @@ @rem Set local scope for the variables with windows NT shell if "%OS%"=="Windows_NT" setlocal -@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= - set DIRNAME=%~dp0 if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@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" "-Xms64m" + @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -35,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -45,34 +64,14 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windowz variants - -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ - :execute @rem Setup the command line set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell