Skip to content
This repository has been archived by the owner on Aug 16, 2023. It is now read-only.

Commit

Permalink
Updates to AndroidX
Browse files Browse the repository at this point in the history
  • Loading branch information
@objcode
Manuel Vivo authored and objcode committed Nov 8, 2019
1 parent d3a9db3 commit f7fc492
Show file tree
Hide file tree
Showing 16 changed files with 42 additions and 40 deletions.
14 changes: 7 additions & 7 deletions backup-codelab-done/app/build.gradle
View file
Expand Up @@ -15,15 +15,15 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 26
buildToolsVersion '26.0.2'
compileSdkVersion 29
buildToolsVersion '29.0.2'
defaultConfig {
applicationId "com.googlecodelabs.example.backupexample"
minSdkVersion 17
targetSdkVersion 26
targetSdkVersion 29
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
release {
Expand All @@ -35,7 +35,7 @@ android {

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:appcompat-v7:26.1.0'
implementation 'com.android.support:design:26.1.0'
implementation 'com.android.support:support-v4:26.1.0'
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'com.google.android.material:material:1.0.0'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
}
4 changes: 2 additions & 2 deletions ...lab-done/app/src/main/java/com/googlecodelabs/example/backupexample/LoggedInActivity.java
View file
Expand Up @@ -16,8 +16,8 @@

import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v7.app.AppCompatActivity;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import android.view.View;
import android.widget.Button;
import android.widget.TextView;
Expand Down
4 changes: 2 additions & 2 deletions ...odelab-done/app/src/main/java/com/googlecodelabs/example/backupexample/LoginActivity.java
View file
Expand Up @@ -21,8 +21,8 @@
import android.os.AsyncTask;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v7.app.AppCompatActivity;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import android.view.KeyEvent;
import android.view.View;
import android.view.View.OnClickListener;
Expand Down
5 changes: 2 additions & 3 deletions ...up-codelab-done/app/src/main/java/com/googlecodelabs/example/backupexample/PrefUtils.java
View file
Expand Up @@ -16,10 +16,9 @@

import android.content.Context;
import android.content.SharedPreferences;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import android.text.Html;
import android.text.Spannable;
import android.text.Spanned;

/**
Expand Down
8 changes: 4 additions & 4 deletions backup-codelab-done/app/src/main/res/layout/activity_login.xml
View file
Expand Up @@ -48,7 +48,7 @@
android:layout_height="wrap_content"
android:orientation="vertical">

<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">

Expand All @@ -61,9 +61,9 @@
android:maxLines="1"
android:singleLine="true" />

</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>

<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">

Expand All @@ -79,7 +79,7 @@
android:maxLines="1"
android:singleLine="true" />

</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>

<Button
android:id="@+id/email_sign_in_button"
Expand Down
2 changes: 1 addition & 1 deletion backup-codelab-done/build.gradle
View file
Expand Up @@ -21,7 +21,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'com.android.tools.build:gradle:3.5.2'


// NOTE: Do not place your application dependencies here; they belong
Expand Down
2 changes: 2 additions & 0 deletions backup-codelab-done/gradle.properties
View file
Expand Up @@ -9,6 +9,8 @@

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

# When configured, Gradle will run in incubating parallel mode.
Expand Down
2 changes: 1 addition & 1 deletion backup-codelab-done/gradle/wrapper/gradle-wrapper.properties
View file
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
14 changes: 7 additions & 7 deletions backup-codelab-start/app/build.gradle
View file
Expand Up @@ -15,15 +15,15 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 26
buildToolsVersion '26.0.2'
compileSdkVersion 29
buildToolsVersion '29.0.2'
defaultConfig {
applicationId "com.googlecodelabs.example.backupexample"
minSdkVersion 17
targetSdkVersion 26
targetSdkVersion 29
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
release {
Expand All @@ -35,7 +35,7 @@ android {

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:appcompat-v7:26.1.0'
implementation 'com.android.support:design:26.1.0'
implementation 'com.android.support:support-v4:26.1.0'
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'com.google.android.material:material:1.0.0'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
}
4 changes: 2 additions & 2 deletions ...ab-start/app/src/main/java/com/googlecodelabs/example/backupexample/LoggedInActivity.java
View file
Expand Up @@ -16,8 +16,8 @@

import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v7.app.AppCompatActivity;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import android.view.View;
import android.widget.Button;
import android.widget.TextView;
Expand Down
4 changes: 2 additions & 2 deletions ...delab-start/app/src/main/java/com/googlecodelabs/example/backupexample/LoginActivity.java
View file
Expand Up @@ -21,8 +21,8 @@
import android.os.AsyncTask;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v7.app.AppCompatActivity;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import android.view.KeyEvent;
import android.view.View;
import android.view.View.OnClickListener;
Expand Down
5 changes: 2 additions & 3 deletions ...p-codelab-start/app/src/main/java/com/googlecodelabs/example/backupexample/PrefUtils.java
View file
Expand Up @@ -16,10 +16,9 @@

import android.content.Context;
import android.content.SharedPreferences;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import android.text.Html;
import android.text.Spannable;
import android.text.Spanned;

/**
Expand Down
8 changes: 4 additions & 4 deletions backup-codelab-start/app/src/main/res/layout/activity_login.xml
View file
Expand Up @@ -48,7 +48,7 @@
android:layout_height="wrap_content"
android:orientation="vertical">

<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">

Expand All @@ -61,9 +61,9 @@
android:maxLines="1"
android:singleLine="true" />

</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>

<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">

Expand All @@ -79,7 +79,7 @@
android:maxLines="1"
android:singleLine="true" />

</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>

<Button
android:id="@+id/email_sign_in_button"
Expand Down
2 changes: 1 addition & 1 deletion backup-codelab-start/build.gradle
View file
Expand Up @@ -21,7 +21,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'com.android.tools.build:gradle:3.5.2'


// NOTE: Do not place your application dependencies here; they belong
Expand Down
2 changes: 2 additions & 0 deletions backup-codelab-start/gradle.properties
View file
Expand Up @@ -9,6 +9,8 @@

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

# When configured, Gradle will run in incubating parallel mode.
Expand Down
2 changes: 1 addition & 1 deletion backup-codelab-start/gradle/wrapper/gradle-wrapper.properties
View file
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

0 comments on commit f7fc492

Please sign in to comment.