Skip to content

Upgrade the compileSdkVersion and buildToolsVersion. #66

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Upgrade the compileSdkVersion and buildToolsVersion. #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 18 additions & 10 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 27
buildToolsVersion "27.0.3"
namespace "com.example.android.sampletvinput"
compileSdkVersion 34
buildToolsVersion "34.0.0"

defaultConfig {
applicationId "com.example.android.sampletvinput"
minSdkVersion 21
targetSdkVersion 27
minSdkVersion 26
targetSdkVersion 34
versionCode 3
versionName "1.2"
}
Expand All @@ -18,16 +19,23 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
}
}
}
packagingOptions {
resources {
excludes += [
'error_prone/Annotations.gwt.xml',
'third_party/java_src/error_prone/project/annotations/Annotations.gwt.xml',
'third_party/java_src/error_prone/project/annotations/Google_internal.gwt.xml',
'jsr305_annotations/Jsr305_annotations.gwt.xml'
]
}
}

ext {
appCompatVersion = '27.1.1'
}

dependencies {
implementation project(':library')
implementation "com.android.support:recyclerview-v7:$appCompatVersion"
implementation "com.android.support:leanback-v17:$appCompatVersion"
implementation "com.android.support:appcompat-v7:$appCompatVersion"
implementation "androidx.recyclerview:recyclerview:1.3.0"
implementation "androidx.leanback:leanback:1.0.0"
implementation "androidx.appcompat:appcompat:1.6.1"
implementation 'com.google.android.exoplayer:exoplayer:r1.5.14'
Copy link

@rezaultf rezaultf Sep 9, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi, r1.5.14 is not available now. How can you got this dependency? Do you have .jar file of this version? Otherwise this PR will not work anymore.

Copy link

@RubenLauro RubenLauro Feb 26, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was able to compile it with implementation 'com.bartoszlipinski:exoplayer1:r1.5.14'

}
26 changes: 14 additions & 12 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,7 @@
limitations under the License.
-->

<manifest
package="com.example.android.sampletvinput"
xmlns:android="http://schemas.android.com/apk/res/android">

<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="25"/>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<!-- Required to play internet-based streaming contents. -->
<uses-permission android:name="android.permission.INTERNET" />
Expand Down Expand Up @@ -50,8 +46,9 @@
android:allowBackup="false"
android:icon="@drawable/android_48dp"
android:label="@string/app_name"
android:theme="@style/Theme.Leanback">
<activity android:name=".MainActivity">
android:theme="@style/Theme.Leanback"
android:banner="@drawable/your_company">
<activity android:name=".MainActivity" android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LEANBACK_LAUNCHER" />
Expand All @@ -61,7 +58,8 @@
<!-- Launched by the TV app before it uses RichTvInputService. This registers channels and
sets up SampleJobService to provide program information in the background. -->
<activity android:name=".rich.RichTvInputSetupActivity"
android:theme="@style/TifSetup">
android:theme="@style/TifSetup"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
</intent-filter>
Expand All @@ -71,7 +69,8 @@
the app-link connected to this activity. -->
<activity
android:name=".rich.RichAppLinkDetailsActivity"
android:theme="@style/Theme.Transparent">
android:theme="@style/Theme.Transparent"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
</intent-filter>
Expand All @@ -81,7 +80,8 @@
the app-link connected to this activity. -->
<activity
android:name=".rich.RichAppLinkSidePanelActivity"
android:theme="@style/Theme.Panel">
android:theme="@style/Theme.Panel"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
</intent-filter>
Expand All @@ -95,7 +95,8 @@
<service
android:name=".rich.RichTvInputService"
android:label="@string/rich_input_label"
android:permission="android.permission.BIND_TV_INPUT">
android:permission="android.permission.BIND_TV_INPUT"
android:exported="true">
<!-- Required filter used by the system to launch our account service. -->
<intent-filter>
<action android:name="android.media.tv.TvInputService" />
Expand All @@ -114,7 +115,8 @@
android:exported="true" />

<!-- This receiver is for sync job schedule well after reboot. -->
<receiver android:name=".rich.RichBootReceiver">
<receiver android:name=".rich.RichBootReceiver"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED" />
</intent-filter>
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/java/com/example/android/sampletvinput/player/DemoPlayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@
import android.os.Build;
import android.os.Handler;
import android.os.Looper;
import android.support.annotation.RequiresApi;
import android.view.Surface;

import androidx.annotation.RequiresApi;

import com.google.android.exoplayer.CodecCounters;
import com.google.android.exoplayer.DummyTrackRenderer;
import com.google.android.exoplayer.ExoPlaybackException;
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/java/com/example/android/sampletvinput/player/FakeTrickplayRunnable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,10 @@
import android.os.Build;
import android.os.Handler;
import android.os.Looper;
import android.support.annotation.RequiresApi;
import android.util.Log;

import androidx.annotation.RequiresApi;

import com.google.android.media.tv.companionlibrary.TvPlayer;

@RequiresApi(api = Build.VERSION_CODES.M)
Expand Down
39 changes: 22 additions & 17 deletions app/src/main/java/com/example/android/sampletvinput/rich/FirstStepFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,14 @@

import android.app.Activity;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v17.leanback.app.GuidedStepFragment;
import android.support.v17.leanback.widget.GuidanceStylist.Guidance;
import android.support.v17.leanback.widget.GuidedAction;

import androidx.annotation.NonNull;
import androidx.leanback.app.GuidedStepFragment;
import androidx.leanback.widget.GuidanceStylist;
import androidx.leanback.widget.GuidedAction;

import com.example.android.sampletvinput.R;
import java.util.List;

Expand All @@ -30,27 +33,29 @@ public class FirstStepFragment extends GuidedStepFragment {

@Override
@NonNull
public Guidance onCreateGuidance(@NonNull Bundle savedInstanceState) {
public GuidanceStylist.Guidance onCreateGuidance(@NonNull Bundle savedInstanceState) {
String title = getString(R.string.rich_input_label);

String description = getString(R.string.rich_setup_first_step_description);
Drawable icon = getActivity().getDrawable(R.drawable.android_48dp);
return new Guidance(title, description, null, icon);
return new GuidanceStylist.Guidance(title, description, null, icon);
}

@Override
public void onCreateActions(@NonNull List<GuidedAction> actions, Bundle savedInstanceState) {
actions.add(
new GuidedAction.Builder(getContext())
.id(GuidedAction.ACTION_ID_NEXT)
.title(R.string.rich_setup_add_channel)
.hasNext(true)
.build());
actions.add(
new GuidedAction.Builder(getContext())
.id(GuidedAction.ACTION_ID_CANCEL)
.title(R.string.rich_setup_cancel)
.build());
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
actions.add(
new GuidedAction.Builder(getContext())
.id(GuidedAction.ACTION_ID_NEXT)
.title(R.string.rich_setup_add_channel)
.hasNext(true)
.build());
actions.add(
new GuidedAction.Builder(getContext())
.id(GuidedAction.ACTION_ID_CANCEL)
.title(R.string.rich_setup_cancel)
.build());
}
//TODO add about screen
}

Expand Down
24 changes: 13 additions & 11 deletions app/src/main/java/com/example/android/sampletvinput/rich/RichAppLinkDetailsFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,19 @@
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.os.Bundle;
import android.support.v17.leanback.app.DetailsFragment;
import android.support.v17.leanback.widget.AbstractDetailsDescriptionPresenter;
import android.support.v17.leanback.widget.Action;
import android.support.v17.leanback.widget.ArrayObjectAdapter;
import android.support.v17.leanback.widget.ClassPresenterSelector;
import android.support.v17.leanback.widget.DetailsOverviewRow;
import android.support.v17.leanback.widget.DetailsOverviewRowPresenter;
import android.support.v17.leanback.widget.ListRow;
import android.support.v17.leanback.widget.ListRowPresenter;
import android.support.v17.leanback.widget.OnActionClickedListener;
import android.support.v4.content.ContextCompat;

import androidx.core.content.ContextCompat;
import androidx.leanback.app.DetailsFragment;
import androidx.leanback.widget.AbstractDetailsDescriptionPresenter;
import androidx.leanback.widget.Action;
import androidx.leanback.widget.ArrayObjectAdapter;
import androidx.leanback.widget.ClassPresenterSelector;
import androidx.leanback.widget.DetailsOverviewRow;
import androidx.leanback.widget.DetailsOverviewRowPresenter;
import androidx.leanback.widget.ListRow;
import androidx.leanback.widget.ListRowPresenter;
import androidx.leanback.widget.OnActionClickedListener;

import com.example.android.sampletvinput.R;

/**
Expand Down
6 changes: 4 additions & 2 deletions app/src/main/java/com/example/android/sampletvinput/rich/RichAppLinkSidePanelActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,15 @@

import android.app.Activity;
import android.os.Bundle;
import android.support.v17.leanback.widget.VerticalGridView;
import android.support.v7.widget.RecyclerView;
import android.view.Gravity;
import android.view.View;
import android.view.ViewGroup;
import android.view.WindowManager;
import android.widget.TextView;

import androidx.leanback.widget.VerticalGridView;
import androidx.recyclerview.widget.RecyclerView;

import com.example.android.sampletvinput.R;
import com.google.android.media.tv.companionlibrary.model.Channel;
import com.google.android.media.tv.companionlibrary.model.ModelUtils;
Expand Down
10 changes: 6 additions & 4 deletions app/src/main/java/com/example/android/sampletvinput/rich/RichSetupFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,10 @@
import android.graphics.drawable.Drawable;
import android.media.tv.TvInputInfo;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v17.leanback.widget.GuidanceStylist.Guidance;

import androidx.annotation.NonNull;
import androidx.leanback.widget.GuidanceStylist;

import com.example.android.sampletvinput.R;
import com.example.android.sampletvinput.SampleJobService;
import com.google.android.media.tv.companionlibrary.setup.ChannelSetupStepFragment;
Expand All @@ -44,11 +46,11 @@ public Class<SampleJobService> getEpgSyncJobServiceClass() {
}

@Override
public Guidance onCreateGuidance(@NonNull Bundle savedInstanceState) {
public GuidanceStylist.Guidance onCreateGuidance(@NonNull Bundle savedInstanceState) {
String title = getString(R.string.rich_input_label);
String description = getString(R.string.tif_channel_setup_description);
Drawable icon = getActivity().getDrawable(R.drawable.android_48dp);
return new Guidance(title, description, null, icon);
return new GuidanceStylist.Guidance(title, description, null, icon);
}

public String getInputId() {
Expand Down
6 changes: 4 additions & 2 deletions app/src/main/java/com/example/android/sampletvinput/rich/RichTvInputService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,16 @@
import android.os.Build;
import android.os.Handler;
import android.os.Looper;
import android.support.annotation.Nullable;
import android.support.annotation.RequiresApi;
import android.util.Log;
import android.view.Display;
import android.view.LayoutInflater;
import android.view.View;
import android.view.WindowManager;
import android.view.accessibility.CaptioningManager;

import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;

import com.example.android.sampletvinput.R;
import com.example.android.sampletvinput.SampleJobService;
import com.example.android.sampletvinput.player.DemoPlayer;
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/com/example/android/sampletvinput/rich/RichTvInputSetupActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@

import android.app.Activity;
import android.os.Bundle;
import android.support.v17.leanback.app.GuidedStepFragment;

import androidx.leanback.app.GuidedStepFragment;

/** The setup activity for demonstrating {@link RichTvInputService}. */
public class RichTvInputSetupActivity extends Activity {
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.0'
classpath 'com.android.tools.build:gradle:8.2.0'
}
}

Expand Down
8 changes: 8 additions & 0 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
android.suppressUnsupportedCompileSdk=34
android.useAndroidX=true
org.gradle.daemon=true
org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=4096m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
org.gradle.parallel=true
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false
android.nonFinalResIds=false
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Mar 28 17:53:17 PDT 2018
#Sun Dec 31 09:04:42 CST 2023
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip
Loading