Merge pull request #22 from skyway/exmaple_v1_1_0

Fixed exmaples for v1.1.0
skyway · Mar 18, 2019 · 696deff · 696deff
2 parents f3cfdea + ee15fa6
commit 696deff
Show file tree

Hide file tree

Showing 91 changed files with 225 additions and 3,229 deletions.
diff --git a/examples/.gitignore b/examples/.gitignore
@@ -0,0 +1,22 @@
+# Gradle
+*/.gradle
+*/build
+
+# Local configuration file
+local.properties
+
+# Android Studio
+*.iml
+*/.idea/workspace.xml
+*/.idea/tasks.xml
+*/.idea/gradle.xml
+*/.idea/assetWizardSettings.xml
+*/.idea/dictionaries
+*/.idea/libraries
+*/.idea/caches
+*/.idea/caches/build_file_checksums.ser
+*/.idea/modules.xml
+*/.idea/codeStyles
+*/.idea/inspectionProfiles
+*/app/libs/*
+*/app/build
diff --git a/examples/mesh-textchat/.gitignore b/examples/mesh-textchat/.gitignore
diff --git a/examples/mesh-textchat/.idea/compiler.xml b/examples/mesh-textchat/.idea/compiler.xml
diff --git a/examples/mesh-textchat/.idea/copyright/profiles_settings.xml b/examples/mesh-textchat/.idea/copyright/profiles_settings.xml
diff --git a/examples/mesh-textchat/.idea/misc.xml b/examples/mesh-textchat/.idea/misc.xml
diff --git a/examples/mesh-textchat/app/.gitignore b/examples/mesh-textchat/app/.gitignore
diff --git a/examples/mesh-textchat/app/build.gradle b/examples/mesh-textchat/app/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
     defaultConfig {
         applicationId "com.ntt.ecl.webrtc.sample_mesh_textchat"
-        minSdkVersion 17
-        targetSdkVersion 25
+        minSdkVersion 21
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -16,17 +16,21 @@ android {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
+        compileOptions {
+            sourceCompatibility JavaVersion.VERSION_1_8
+            targetCompatibility JavaVersion.VERSION_1_8
+        }
     }
 }
 
 dependencies {
-    compile (name:'skyway',ext:'aar')
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    implementation (name:'skyway',ext:'aar')
+    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.android.support:appcompat-v7:25.1.1'
-    testCompile 'junit:junit:4.12'
-    compile 'com.android.support.constraint:constraint-layout:1.0.2'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    testImplementation 'junit:junit:4.12'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
 }
 
 repositories{

diff --git a/...mesh-textchat/app/src/main/java/com/ntt/ecl/webrtc/sample_mesh_textchat/MainActivity.java b/...mesh-textchat/app/src/main/java/com/ntt/ecl/webrtc/sample_mesh_textchat/MainActivity.java
@@ -100,7 +100,7 @@ public void onCallback(Object object) {
 			@Override
 			public void onCallback(Object object) {
 				PeerError error = (PeerError) object;
-				Log.d(TAG, "[On/Error]" + error);
+				Log.d(TAG, "[On/Error]" + error.message);
 			}
 		});
 

diff --git a/examples/mesh-textchat/build.gradle b/examples/mesh-textchat/build.gradle
@@ -3,9 +3,10 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0'
+        classpath 'com.android.tools.build:gradle:3.2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -15,6 +16,7 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }
 

diff --git a/examples/mesh-textchat/gradle/wrapper/gradle-wrapper.properties b/examples/mesh-textchat/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Dec 28 10:00:20 PST 2015
+#Mon Mar 11 16:34:36 JST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/examples/mesh-videochat/.gitignore b/examples/mesh-videochat/.gitignore
diff --git a/examples/mesh-videochat/.idea/compiler.xml b/examples/mesh-videochat/.idea/compiler.xml
diff --git a/examples/mesh-videochat/.idea/copyright/profiles_settings.xml b/examples/mesh-videochat/.idea/copyright/profiles_settings.xml
diff --git a/examples/mesh-videochat/.idea/misc.xml b/examples/mesh-videochat/.idea/misc.xml
diff --git a/examples/mesh-videochat/app/.gitignore b/examples/mesh-videochat/app/.gitignore
diff --git a/examples/mesh-videochat/app/build.gradle b/examples/mesh-videochat/app/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
     defaultConfig {
         applicationId "com.ntt.ecl.webrtc.sample_mesh_videochat"
-        minSdkVersion 17
-        targetSdkVersion 25
+        minSdkVersion 21
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -16,17 +16,21 @@ android {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
+        compileOptions {
+            sourceCompatibility JavaVersion.VERSION_1_8
+            targetCompatibility JavaVersion.VERSION_1_8
+        }
     }
 }
 
 dependencies {
-    compile (name:'skyway',ext:'aar')
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    implementation (name:'skyway',ext:'aar')
+    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.android.support:appcompat-v7:25.1.1'
-    testCompile 'junit:junit:4.12'
-    compile 'com.android.support.constraint:constraint-layout:1.0.2'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    testImplementation 'junit:junit:4.12'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
 }
 
 repositories{

diff --git a/...sh-videochat/app/src/main/java/com/ntt/ecl/webrtc/sample_mesh_videochat/MainActivity.java b/...sh-videochat/app/src/main/java/com/ntt/ecl/webrtc/sample_mesh_videochat/MainActivity.java
@@ -111,7 +111,7 @@ public void onCallback(Object object) {
 			@Override
 			public void onCallback(Object object) {
 				PeerError error = (PeerError) object;
-				Log.d(TAG, "[On/Error]" + error);
+				Log.d(TAG, "[On/Error]" + error.message);
 			}
 		});
 

diff --git a/examples/mesh-videochat/build.gradle b/examples/mesh-videochat/build.gradle
@@ -3,9 +3,10 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'com.android.tools.build:gradle:3.2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -15,6 +16,7 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }
 

diff --git a/examples/mesh-videochat/gradle/wrapper/gradle-wrapper.properties b/examples/mesh-videochat/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Jun 27 09:57:52 JST 2017
+#Mon Mar 11 16:32:03 JST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/examples/p2p-call/.gitignore b/examples/p2p-call/.gitignore