Skip to content

Commit

Permalink
Merge branch 'release/v0.0.13s'
Browse files Browse the repository at this point in the history
  • Loading branch information
xSAVIKx committed Oct 31, 2018
2 parents efe03a3 + e067f01 commit d9b7893
Show file tree
Hide file tree
Showing 12 changed files with 9 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.5.3/apache-maven-3.5.3-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.0/maven-wrapper-0.4.0.jar
distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.4/apache-maven-3.5.4-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2014-2016 Iurii Sergiichuk
Copyright 2014-2018 Yurii Serhiichuk

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ AndroidScreencast
=================

[![Build Status Travis-CI][travis_badge]][travis] 
[![Dependency Status][versioneye_badge]][versioneye] 
[![Codacy Badge][codacy_badge]][codacy] 
[![Join the chat at https://gitter.im/AndroidScreencast/Lobby][gitter_badge]][gitter] 
[![Apache License][license_badge]][license]
Expand Down
Binary file modified adb/linux/adb
Binary file not shown.
Binary file modified adb/linux/fastboot
Binary file not shown.
Binary file modified adb/macosx/adb
Binary file not shown.
Binary file modified adb/macosx/fastboot
Binary file not shown.
Binary file modified adb/windows/adb.exe
Binary file not shown.
Binary file modified adb/windows/fastboot.exe
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion docs/jnlp/androidscreencast.jnlp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<resources>
<j2se version="1.8+"/>
<jar main="true" download="eager"
href="https://xsavikx.github.io/AndroidScreencast/jnlp/androidscreencast-0.0.12s-executable.jar"/>
href="https://xsavikx.github.io/AndroidScreencast/jnlp/androidscreencast-0.0.13s-executable.jar"/>
</resources>
<application-desc main-class="com.github.xsavikx.androidscreencast.Main"/>
</jnlp>
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.github.xsavikx</groupId>
<artifactId>androidscreencast</artifactId>
<version>0.0.12s</version>
<version>0.0.13s</version>
<name>Android Screencast</name>
<packaging>jar</packaging>
<properties>
<dagger2.version>2.16</dagger2.version>
<ddmlib.version>26.1.2</ddmlib.version>
<dagger2.version>2.19</dagger2.version>
<ddmlib.version>26.2.1</ddmlib.version>
<slf4j.version>1.7.25</slf4j.version>
<logback-classic.version>1.2.3</logback-classic.version>
<guava.version>25.1-jre</guava.version>
<guava.version>26.0-jre</guava.version>
<main.class>com.github.xsavikx.androidscreencast.Main</main.class>
<jdk.version>1.8</jdk.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down Expand Up @@ -63,7 +63,7 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.7.0</version>
<version>3.8.0</version>
<configuration>
<source>${jdk.version}</source>
<target>${jdk.version}</target>
Expand Down

0 comments on commit d9b7893

Please sign in to comment.