diff --git a/.github/workflows/build-video-transformers-java.yml b/.github/workflows/build-media-transformers-java.yml similarity index 81% rename from .github/workflows/build-video-transformers-java.yml rename to .github/workflows/build-media-transformers-java.yml index ff85f37e..2e739bb6 100644 --- a/.github/workflows/build-video-transformers-java.yml +++ b/.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 .. diff --git a/.github/workflows/build-media-transformers-kotlin.yml b/.github/workflows/build-media-transformers-kotlin.yml new file mode 100644 index 00000000..bd1333da --- /dev/null +++ b/.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 .. diff --git a/Media-Transformers-Java/app/build.gradle b/Media-Transformers-Java/app/build.gradle index 884c4838..9a600270 100644 --- a/Media-Transformers-Java/app/build.gradle +++ b/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 diff --git a/Media-Transformers-Java/app/src/main/AndroidManifest.xml b/Media-Transformers-Java/app/src/main/AndroidManifest.xml index 6b90ce3f..8780a18e 100644 --- a/Media-Transformers-Java/app/src/main/AndroidManifest.xml +++ b/Media-Transformers-Java/app/src/main/AndroidManifest.xml @@ -1,5 +1,6 @@ - + diff --git a/Media-Transformers-Java/app/src/main/java/com/tokbox/sample/videotransformers/MainActivity.java b/Media-Transformers-Java/app/src/main/java/com/tokbox/sample/mediatransformers/MainActivity.java similarity index 98% rename from Media-Transformers-Java/app/src/main/java/com/tokbox/sample/videotransformers/MainActivity.java rename to Media-Transformers-Java/app/src/main/java/com/tokbox/sample/mediatransformers/MainActivity.java index 1327fa2d..bacb6fd9 100644 --- a/Media-Transformers-Java/app/src/main/java/com/tokbox/sample/videotransformers/MainActivity.java +++ b/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; diff --git a/Media-Transformers-Java/app/src/main/java/com/tokbox/sample/videotransformers/OpenTokConfig.java b/Media-Transformers-Java/app/src/main/java/com/tokbox/sample/mediatransformers/OpenTokConfig.java similarity index 96% rename from Media-Transformers-Java/app/src/main/java/com/tokbox/sample/videotransformers/OpenTokConfig.java rename to Media-Transformers-Java/app/src/main/java/com/tokbox/sample/mediatransformers/OpenTokConfig.java index e01b491c..5ddea0da 100644 --- a/Media-Transformers-Java/app/src/main/java/com/tokbox/sample/videotransformers/OpenTokConfig.java +++ b/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; diff --git a/Media-Transformers-Java/app/src/main/java/com/tokbox/sample/videotransformers/ServerConfig.java b/Media-Transformers-Java/app/src/main/java/com/tokbox/sample/mediatransformers/ServerConfig.java similarity index 97% rename from Media-Transformers-Java/app/src/main/java/com/tokbox/sample/videotransformers/ServerConfig.java rename to Media-Transformers-Java/app/src/main/java/com/tokbox/sample/mediatransformers/ServerConfig.java index e06f9b1f..1bc610f6 100644 --- a/Media-Transformers-Java/app/src/main/java/com/tokbox/sample/videotransformers/ServerConfig.java +++ b/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; diff --git a/Media-Transformers-Java/app/src/main/java/com/tokbox/sample/videotransformers/network/APIService.java b/Media-Transformers-Java/app/src/main/java/com/tokbox/sample/mediatransformers/network/APIService.java similarity index 73% rename from Media-Transformers-Java/app/src/main/java/com/tokbox/sample/videotransformers/network/APIService.java rename to Media-Transformers-Java/app/src/main/java/com/tokbox/sample/mediatransformers/network/APIService.java index e1f54c58..2496274d 100644 --- a/Media-Transformers-Java/app/src/main/java/com/tokbox/sample/videotransformers/network/APIService.java +++ b/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.*; diff --git a/Media-Transformers-Java/app/src/main/java/com/tokbox/sample/videotransformers/network/EmptyCallback.java b/Media-Transformers-Java/app/src/main/java/com/tokbox/sample/mediatransformers/network/EmptyCallback.java similarity index 84% rename from Media-Transformers-Java/app/src/main/java/com/tokbox/sample/videotransformers/network/EmptyCallback.java rename to Media-Transformers-Java/app/src/main/java/com/tokbox/sample/mediatransformers/network/EmptyCallback.java index c923767d..c5fbf696 100644 --- a/Media-Transformers-Java/app/src/main/java/com/tokbox/sample/videotransformers/network/EmptyCallback.java +++ b/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; diff --git a/Media-Transformers-Java/app/src/main/java/com/tokbox/sample/videotransformers/network/GetSessionResponse.java b/Media-Transformers-Java/app/src/main/java/com/tokbox/sample/mediatransformers/network/GetSessionResponse.java similarity index 80% rename from Media-Transformers-Java/app/src/main/java/com/tokbox/sample/videotransformers/network/GetSessionResponse.java rename to Media-Transformers-Java/app/src/main/java/com/tokbox/sample/mediatransformers/network/GetSessionResponse.java index ed76a6c5..1e83af51 100644 --- a/Media-Transformers-Java/app/src/main/java/com/tokbox/sample/videotransformers/network/GetSessionResponse.java +++ b/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; diff --git a/Media-Transformers-Java/app/src/main/res/values/strings.xml b/Media-Transformers-Java/app/src/main/res/values/strings.xml index ef8233bc..43f12649 100644 --- a/Media-Transformers-Java/app/src/main/res/values/strings.xml +++ b/Media-Transformers-Java/app/src/main/res/values/strings.xml @@ -1,7 +1,7 @@ - Video-Transformers + Media-Transformers Settings Permissions Required