Merge pull request #514 from opentok/media_transforners

Media transformers: Project building on CI  and fix no property namespace

.github/workflows/build-video-transformers-java.yml → .github/workflows/build-media-transformers-java.yml

@@ -1,4 +1,4 @@
-name: Build Video-Transformers-Java
+name: Build Media-Transformers-Java
 
 on:
   push:
@@ -22,4 +22,4 @@ jobs:
           java-version: 15
 
       - name: Build
-        run: cd Video-Transformers-Java && ./gradlew app:assembleRelease && cd ..
+        run: cd Media-Transformers-Java && ./gradlew app:assembleRelease && cd ..

.github/workflows/build-media-transformers-kotlin.yml

@@ -0,0 +1,25 @@
+name: Build Media-Transformers-Java
+
+on:
+  push:
+    branches: [main] # Just in case main was not up to date while merging PR
+  pull_request:
+    types: [opened, synchronize]
+
+jobs:
+  run:
+    continue-on-error: true
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+    steps:
+      - name: checkout
+        uses: actions/checkout@v2
+
+      - name: Set up JDK
+        uses: actions/setup-java@v1
+        with:
+          java-version: 15
+
+      - name: Build
+        run: cd Media-Transformers-Kotlin && ./gradlew app:assembleRelease && cd ..

Media-Transformers-Java/app/build.gradle

@@ -10,7 +10,7 @@ android {
     compileSdkVersion extCompileSdkVersion
 
     defaultConfig {
-        applicationId "com.tokbox.sample.videotransformers"
+        applicationId "com.tokbox.sample.mediatransformers"
         minSdkVersion extMinSdkVersion
         targetSdkVersion extTargetSdkVersion
         versionCode extVersionCode

Media-Transformers-Java/app/src/main/AndroidManifest.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" 
+    package="com.tokbox.sample.mediatransformers">
 
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.INTERNET" />

Media-Transformers-Java/app/src/main/java/com/tokbox/sample/videotransformers/MainActivity.java → Media-Transformers-Java/app/src/main/java/com/tokbox/sample/mediatransformers/MainActivity.java

@@ -1,4 +1,4 @@
-package com.tokbox.sample.videotransformers;
+package com.tokbox.sample.mediatransformers;
 
 import android.Manifest;
 import android.content.Context;
@@ -21,8 +21,8 @@
 import com.opentok.android.Stream;
 import com.opentok.android.Subscriber;
 import com.opentok.android.SubscriberKit;
-import com.tokbox.sample.videotransformers.network.APIService;
-import com.tokbox.sample.videotransformers.network.GetSessionResponse;
+import com.tokbox.sample.mediatransformers.network.APIService;
+import com.tokbox.sample.mediatransformers.network.GetSessionResponse;
 import okhttp3.OkHttpClient;
 import okhttp3.logging.HttpLoggingInterceptor;
 import okhttp3.logging.HttpLoggingInterceptor.Level;

Media-Transformers-Java/app/src/main/java/com/tokbox/sample/videotransformers/OpenTokConfig.java → Media-Transformers-Java/app/src/main/java/com/tokbox/sample/mediatransformers/OpenTokConfig.java

@@ -1,4 +1,4 @@
-package com.tokbox.sample.videotransformers;
+package com.tokbox.sample.mediatransformers;
 
 import android.text.TextUtils;
 import android.webkit.URLUtil;

Media-Transformers-Java/app/src/main/java/com/tokbox/sample/videotransformers/ServerConfig.java → Media-Transformers-Java/app/src/main/java/com/tokbox/sample/mediatransformers/ServerConfig.java

@@ -1,4 +1,4 @@
-package com.tokbox.sample.videotransformers;
+package com.tokbox.sample.mediatransformers;
 
 import android.text.TextUtils;
 import android.webkit.URLUtil;

Media-Transformers-Java/app/src/main/java/com/tokbox/sample/videotransformers/network/APIService.java → Media-Transformers-Java/app/src/main/java/com/tokbox/sample/mediatransformers/network/APIService.java

@@ -1,4 +1,4 @@
-package com.tokbox.sample.videotransformers.network;
+package com.tokbox.sample.mediatransformers.network;
 
 import retrofit2.Call;
 import retrofit2.http.*;

Media-Transformers-Java/app/src/main/java/com/tokbox/sample/videotransformers/network/EmptyCallback.java → Media-Transformers-Java/app/src/main/java/com/tokbox/sample/mediatransformers/network/EmptyCallback.java

@@ -1,4 +1,4 @@
-package com.tokbox.sample.videotransformers.network;
+package com.tokbox.sample.mediatransformers.network;
 
 import retrofit2.Call;
 import retrofit2.Callback;

Media-Transformers-Java/app/src/main/java/com/tokbox/sample/videotransformers/network/GetSessionResponse.java → Media-Transformers-Java/app/src/main/java/com/tokbox/sample/mediatransformers/network/GetSessionResponse.java

@@ -1,4 +1,4 @@
-package com.tokbox.sample.videotransformers.network;
+package com.tokbox.sample.mediatransformers.network;
 
 import com.squareup.moshi.Json;
 

Media-Transformers-Java/app/src/main/res/values/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">Video-Transformers</string>
+    <string name="app_name">Media-Transformers</string>
     <string name="action_settings">Settings</string>
 
     <string name="title_settings_dialog">Permissions Required</string>