Skip to content

Commit

Permalink
Dependency updates: (#36)
Browse files Browse the repository at this point in the history
AGP to 4.2.0-alpha07
Kotlin to 1.4.0
target & compile SDK to 30
Hyperion to 0.9.29
Gradle to 6.6

Code cleanup
  • Loading branch information
koral-- authored Aug 20, 2020
1 parent 3dc63ee commit 2b8f690
Show file tree
Hide file tree
Showing 7 changed files with 41 additions and 31 deletions.
8 changes: 4 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ GEM
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
ansi (1.5.0)
ast (2.4.0)
ast (2.4.1)
claide (1.0.3)
claide-plugins (0.9.2)
cork
Expand All @@ -13,7 +13,7 @@ GEM
colored2 (3.1.2)
cork (0.3.0)
colored2 (~> 3.1)
danger (8.0.0)
danger (8.0.4)
claide (~> 1.0)
claide-plugins (>= 0.9.2)
colored2 (~> 3.1)
Expand All @@ -39,7 +39,7 @@ GEM
faraday (>= 0.8)
git (1.7.0)
rchardet (~> 1.8)
kramdown (2.2.1)
kramdown (2.3.0)
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
Expand All @@ -49,7 +49,7 @@ GEM
octokit (4.18.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
oga (3.2)
oga (3.3)
ast
ruby-ll (~> 2.1)
open4 (1.3.4)
Expand Down
23 changes: 23 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ dependencies {
debugImplementation 'pl.droidsonroids.foqa:foqa:<latest version>'
}
```
```kotlin
dependencies {
debugImplementation("pl.droidsonroids.foqa:foqa:<latest version>")
}
```
Latest version number: [![Maven Central](https://maven-badges.herokuapp.com/maven-central/pl.droidsonroids.foqa/foqa/badge.svg)](https://maven-badges.herokuapp.com/maven-central/pl.droidsonroids.foqa/foqa)

If not already present add Maven Central repository:
Expand Down Expand Up @@ -56,6 +61,12 @@ dependencies {
}
```

```kotlin
dependencies {
debugImplementation("pl.droidsonroids.foqa:deviceinfo:<latest version>")
}
```

Latest version number: [![Maven Central](https://maven-badges.herokuapp.com/maven-central/pl.droidsonroids.foqa/deviceinfo/badge.svg)](https://maven-badges.herokuapp.com/maven-central/pl.droidsonroids.foqa/deviceinfo)

### Font Scale plugin
Expand All @@ -73,6 +84,12 @@ dependencies {
}
```

```kotlin
dependencies {
debugImplementation("pl.droidsonroids.foqa:fontscale:<latest version>")
}
```

Latest version number: [![Maven Central](https://maven-badges.herokuapp.com/maven-central/pl.droidsonroids.foqa/fontscale/badge.svg)](https://maven-badges.herokuapp.com/maven-central/pl.droidsonroids.foqa/fontscale)

### Chuck plugin
Expand All @@ -90,6 +107,12 @@ dependencies {
}
```

```kotlin
dependencies {
debugImplementation("pl.droidsonroids.foqa:chuck:<latest version>")
}
```

Latest version number: [![Maven Central](https://maven-badges.herokuapp.com/maven-central/pl.droidsonroids.foqa/chuck/badge.svg)](https://maven-badges.herokuapp.com/maven-central/pl.droidsonroids.foqa/chuck)

## License
Expand Down
14 changes: 7 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
buildscript {
ext.versions = [
minSdk : 16,
compileSdk : 29,
targetSdk : 29,
kotlin : '1.3.72',
androidGradlePlugin: '4.1.0-alpha09',
versionsPlugin : '0.27.0',
hyperion : '0.9.27',
compileSdk : 30,
targetSdk : 30,
kotlin : '1.4.0',
androidGradlePlugin: '4.2.0-alpha07',
versionsPlugin : '0.29.0',
hyperion : '0.9.29',
debugDb : '1.0.6',
chucker : '3.2.0',
hyperionAppInfo : '1.1.0',
deviceNames : '2.0.0',
autoService : '1.0-rc7',
shipkit : '2.3.0',
detekt : '1.7.1',
detekt : '1.11.1',
androidxAnnotations: '1.2.0-alpha01'
]

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Mon May 25 23:26:02 CEST 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-bin.zip
2 changes: 2 additions & 0 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ esac

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
Expand Down Expand Up @@ -129,6 +130,7 @@ fi
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
Expand Down
22 changes: 4 additions & 18 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ 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.
Expand All @@ -54,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%
Expand All @@ -64,28 +64,14 @@ echo location of your Java installation.

goto fail

:init
@rem Get command-line arguments, handling Windows variants

if not "%OS%" == "Windows_NT" goto win9xME_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=%*

: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
Expand Down

0 comments on commit 2b8f690

Please sign in to comment.