Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Jul 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build Video-Transformers-Java
name: Build Media-Transformers-Java

on:
push:
Expand All @@ -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 ..
25 changes: 25 additions & 0 deletions .github/workflows/build-media-transformers-kotlin.yml
Original file line number Diff line number Diff line change
@@ -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 ..
2 changes: 1 addition & 1 deletion Media-Transformers-Java/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ android {
compileSdkVersion extCompileSdkVersion

defaultConfig {
applicationId "com.tokbox.sample.videotransformers"
applicationId "com.tokbox.sample.mediatransformers"
minSdkVersion extMinSdkVersion
targetSdkVersion extTargetSdkVersion
versionCode extVersionCode
Expand Down
3 changes: 2 additions & 1 deletion Media-Transformers-Java/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -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" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.tokbox.sample.videotransformers;
package com.tokbox.sample.mediatransformers;

import android.Manifest;
import android.content.Context;
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.tokbox.sample.videotransformers;
package com.tokbox.sample.mediatransformers;

import android.text.TextUtils;
import android.webkit.URLUtil;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.tokbox.sample.videotransformers;
package com.tokbox.sample.mediatransformers;

import android.text.TextUtils;
import android.webkit.URLUtil;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.tokbox.sample.videotransformers.network;
package com.tokbox.sample.mediatransformers.network;

import retrofit2.Call;
import retrofit2.http.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.tokbox.sample.videotransformers.network;
package com.tokbox.sample.mediatransformers.network;

import retrofit2.Call;
import retrofit2.Callback;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.tokbox.sample.videotransformers.network;
package com.tokbox.sample.mediatransformers.network;

import com.squareup.moshi.Json;

Expand Down
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
Loading