Skip to content

Commit deef5b4

Browse files
anirudhramananthekirankumar
authored andcommitted
Migration to Android X (#19)
* bumping gradle version and migrating to android x * Update .travis.yml
1 parent 5717b60 commit deef5b4

22 files changed

+58
-56
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ android:
66
components:
77
- tools
88
- platform-tools
9-
- build-tools-27.0.3
10-
- android-27
9+
- build-tools-28.0.3
10+
- android-28
1111
- extra-android-support
1212
- extra-android-m2repository
1313
- extra-google-m2repository

app/build.gradle

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 27
5-
buildToolsVersion "27.0.3"
4+
compileSdkVersion 28
5+
buildToolsVersion '28.0.3'
66
defaultConfig {
77
applicationId "com.flipkart.youtubeviewdemo"
88
minSdkVersion 14
9-
targetSdkVersion 27
9+
targetSdkVersion 28
1010
versionCode 1
1111
versionName "1.0"
12-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
12+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1313
}
1414
buildTypes {
1515
release {
@@ -21,10 +21,10 @@ android {
2121

2222
dependencies {
2323
implementation fileTree(dir: 'libs', include: ['*.jar'])
24-
implementation 'com.android.support:design:27.1.1'
25-
implementation 'com.android.support:support-v4:27.1.1'
26-
implementation 'com.android.support:appcompat-v7:27.1.1'
27-
implementation 'com.android.support.constraint:constraint-layout:1.1.0'
24+
implementation 'com.google.android.material:material:1.1.0-alpha03'
25+
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
26+
implementation 'androidx.appcompat:appcompat:1.1.0-alpha02'
27+
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3'
2828
implementation 'com.squareup.picasso:picasso:2.5.2'
2929
implementation project(':inline-youtube-view')
3030

app/src/main/java/com/flipkart/youtubeviewdemo/MainActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
import android.content.Intent;
2222
import android.os.Bundle;
23-
import android.support.v7.app.AppCompatActivity;
23+
import androidx.appcompat.app.AppCompatActivity;
2424
import android.view.View;
2525
import android.widget.Button;
2626

app/src/main/java/com/flipkart/youtubeviewdemo/youtubenative/YouTubeNativeActivityDemo.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
package com.flipkart.youtubeviewdemo.youtubenative;
2020

2121
import android.os.Bundle;
22-
import android.support.annotation.Nullable;
23-
import android.support.v4.app.FragmentTransaction;
24-
import android.support.v7.app.AppCompatActivity;
22+
import androidx.annotation.Nullable;
23+
import androidx.fragment.app.FragmentTransaction;
24+
import androidx.appcompat.app.AppCompatActivity;
2525

2626
import com.flipkart.youtubeviewdemo.R;
2727

app/src/main/java/com/flipkart/youtubeviewdemo/youtubenative/YouTubeNativeFragmentDemo.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
package com.flipkart.youtubeviewdemo.youtubenative;
2020

2121
import android.os.Bundle;
22-
import android.support.annotation.NonNull;
23-
import android.support.annotation.Nullable;
24-
import android.support.v4.app.Fragment;
25-
import android.support.v7.widget.LinearLayoutManager;
26-
import android.support.v7.widget.RecyclerView;
22+
import androidx.annotation.NonNull;
23+
import androidx.annotation.Nullable;
24+
import androidx.fragment.app.Fragment;
25+
import androidx.recyclerview.widget.LinearLayoutManager;
26+
import androidx.recyclerview.widget.RecyclerView;
2727
import android.view.LayoutInflater;
2828
import android.view.View;
2929
import android.view.ViewGroup;

app/src/main/java/com/flipkart/youtubeviewdemo/youtubenative/YouTubePlayerAdapter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
*/
1919
package com.flipkart.youtubeviewdemo.youtubenative;
2020

21-
import android.support.annotation.NonNull;
22-
import android.support.v4.app.Fragment;
23-
import android.support.v7.widget.RecyclerView;
21+
import androidx.annotation.NonNull;
22+
import androidx.fragment.app.Fragment;
23+
import androidx.recyclerview.widget.RecyclerView;
2424
import android.view.LayoutInflater;
2525
import android.view.View;
2626
import android.view.ViewGroup;

app/src/main/res/layout/youtube_native_activity_demo.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
android:layout_width="match_parent"
44
android:layout_height="match_parent">
55

@@ -10,4 +10,4 @@
1010

1111
</RelativeLayout>
1212

13-
</android.support.constraint.ConstraintLayout>
13+
</androidx.constraintlayout.widget.ConstraintLayout>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<android.support.v7.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
2+
<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
33
android:id="@+id/recyclerView"
44
android:layout_width="match_parent"
55
android:layout_height="match_parent" />

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
google()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.1.4'
9+
classpath 'com.android.tools.build:gradle:3.2.1'
1010

1111
// NOTE: Do not place your application dependencies here; they belong
1212
// in the individual module build.gradle files

gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

1010
# Specifies the JVM arguments used for the daemon process.
1111
# The setting is particularly useful for tweaking memory settings.
12+
android.enableJetifier=true
13+
android.useAndroidX=true
1214
org.gradle.jvmargs=-Xmx1536m
1315

1416
# When configured, Gradle will run in incubating parallel mode.

0 commit comments

Comments
 (0)