update AndroidStudio

songoku20 · Dec 15, 2016 · d6af52f · d6af52f
1 parent 90edcd1
commit d6af52f
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 38 deletions.
diff --git a/app/app.iml b/app/app.iml
@@ -32,12 +32,14 @@
  <sourceFolder url="file:https://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
+ <sourceFolder url="file:https://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
  <sourceFolder url="file:https://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
  <sourceFolder url="file:https://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
+ <sourceFolder url="file:https://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
  <sourceFolder url="file:https://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/debug/res" type="java-resource" />
@@ -47,64 +49,55 @@
  <sourceFolder url="file:https://$MODULE_DIR$/src/debug/java" isTestSource="false" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/main/res" type="java-resource" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/main/resources" type="java-resource" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/main/assets" type="java-resource" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/main/java" isTestSource="false" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/main/jni" isTestSource="false" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/main/rs" isTestSource="false" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/test/res" type="java-test-resource" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/test/java" isTestSource="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/test/jni" isTestSource="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
- <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/assets" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
  <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/blame" />
- <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/builds" />
- <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/bundles" />
- <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/classes" />
- <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/dependency-cache" />
  <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/23.4.0/jars" />
  <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.4.0/jars" />
  <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.4.0/jars" />
  <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/23.4.0/jars" />
  <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/incremental" />
- <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/incremental-classes" />
- <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
- <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/incremental-verifier" />
- <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/instant-run-support" />
- <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/jniLibs" />
  <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/manifests" />
- <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/reload-dex" />
  <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/res" />
- <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/restart-dex" />
  <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/rs" />
  <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/symbols" />
- <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/transforms" />
  <excludeFolder url="file:https://$MODULE_DIR$/build/outputs" />
- <excludeFolder url="file:https://$MODULE_DIR$/build/tmp" />
  </content>
  <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
  <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" exported="" name="commons-io-2.5" level="project" />
  <orderEntry type="library" exported="" name="support-annotations-23.4.0" level="project" />
+ <orderEntry type="library" exported="" name="commons-io-2.5" level="project" />
  <orderEntry type="library" exported="" name="animated-vector-drawable-23.4.0" level="project" />
  <orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
  <orderEntry type="library" exported="" name="commons-lang3-3.4" level="project" />

diff --git a/app/src/main/java/com/haishinkit/rtmp/RTMPConnection.java b/app/src/main/java/com/haishinkit/rtmp/RTMPConnection.java
@@ -297,14 +297,12 @@ void listen(final ByteBuffer buffer) {
  if (!payload.hasRemaining()) {
  payload.flip();
  message.decode(payload).execute(this);
- Log.w(getClass().getName(), message.toString());
  payloads.remove(payload);
  }
  } else {
  message = chunk.decode(streamID, this, buffer);
  if (message.getLength() <= chunkSizeC) {
  message.decode(buffer).execute(this);
- Log.w(getClass().getName(), message.toString());
  } else {
  payload = ByteBuffer.allocate(message.getLength());
  payload.put(buffer.array(), buffer.position(), chunkSizeC);

diff --git a/app/src/main/java/com/haishinkit/rtmp/RTMPSocket.java b/app/src/main/java/com/haishinkit/rtmp/RTMPSocket.java
@@ -66,9 +66,7 @@ public synchronized void doOutput(final RTMPChunk chunk, final RTMPMessage messa
  if (chunk == null || message == null) {
  throw new IllegalArgumentException();
  }
- Log.w(getClass().getName() + "#doOutput", message.toString());
  for (ByteBuffer buffer : chunk.encode(this, message)) {
- Log.w(getClass().getName() + "#doOutput", ByteBufferUtils.toHexString(buffer));
  doOutput(buffer);
  }
  }

diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
  jcenter()
  }
  dependencies {
- classpath 'com.android.tools.build:gradle:2.0.0'
+ classpath 'com.android.tools.build:gradle:2.2.3'
  // NOTE: Do not place your application dependencies here; they belong
  // in the individual module build.gradle files
  }

diff --git a/build/intermediates/dex-cache/cache.xml b/build/intermediates/dex-cache/cache.xml
diff --git a/commons/commons.iml b/commons/commons.iml
@@ -33,12 +33,14 @@
  <sourceFolder url="file:https://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
+ <sourceFolder url="file:https://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
  <sourceFolder url="file:https://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
  <sourceFolder url="file:https://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
+ <sourceFolder url="file:https://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
  <sourceFolder url="file:https://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/debug/res" type="java-resource" />
@@ -48,49 +50,53 @@
  <sourceFolder url="file:https://$MODULE_DIR$/src/debug/java" isTestSource="false" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/main/res" type="java-resource" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/main/resources" type="java-resource" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/main/assets" type="java-resource" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/main/java" isTestSource="false" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/main/jni" isTestSource="false" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/main/rs" isTestSource="false" />
- <sourceFolder url="file:https://$MODULE_DIR$/src/test/res" type="java-test-resource" />
- <sourceFolder url="file:https://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
- <sourceFolder url="file:https://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
- <sourceFolder url="file:https://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
- <sourceFolder url="file:https://$MODULE_DIR$/src/test/java" isTestSource="true" />
- <sourceFolder url="file:https://$MODULE_DIR$/src/test/jni" isTestSource="true" />
- <sourceFolder url="file:https://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
- <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/annotations" />
- <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/assets" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/test/jni" isTestSource="true" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
  <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/blame" />
  <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/bundles" />
- <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/classes" />
- <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/dependency-cache" />
+ <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/23.4.0/jars" />
+ <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.4.0/jars" />
+ <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.4.0/jars" />
+ <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/23.4.0/jars" />
  <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/incremental" />
- <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/jniLibs" />
  <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/lint" />
+ <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/manifests" />
  <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/res" />
  <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/rs" />
+ <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/shaders" />
  <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/symbols" />
- <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/transforms" />
  <excludeFolder url="file:https://$MODULE_DIR$/build/outputs" />
- <excludeFolder url="file:https://$MODULE_DIR$/build/tmp" />
  </content>
  <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
  <orderEntry type="sourceFolder" forTests="false" />

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Dec 28 10:00:20 PST 2015
+#Thu Dec 15 07:34:54 JST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\:https://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\:https://services.gradle.org/distributions/gradle-2.14.1-all.zip