Skip to content

Commit 498d4db

Browse files
author
Doug Sigelbaum
committed
Gradle updates and general cleanup.
1 parent 6345b28 commit 498d4db

File tree

17 files changed

+53
-49
lines changed

17 files changed

+53
-49
lines changed

‎slices-basic-codelab/SliceBrowser.apk‎

-3.73 MB
Binary file not shown.

‎slices-basic-codelab/slice-viewer.apk‎

2.36 MB
Binary file not shown.

‎slices-basic-codelab/step-00/SliceCodelab/app/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ android {
44
compileSdkVersion 'android-P'
55
defaultConfig {
66
applicationId "com.android.example.slicecodelab"
7-
minSdkVersion 27
8-
targetSdkVersion 27
7+
minSdkVersion 19
8+
targetSdkVersion 28
99
versionCode 1
1010
versionName "1.0"
1111
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -20,7 +20,7 @@ android {
2020

2121
dependencies {
2222
implementation fileTree(dir: 'libs', include: ['*.jar'])
23-
implementation 'com.android.support:appcompat-v7:28.0.0-alpha1'
23+
implementation 'androidx.appcompat:appcompat:1.0.0-alpha1'
2424
implementation 'com.android.support.constraint:constraint-layout:1.1.0'
2525
testImplementation 'junit:junit:4.12'
2626
androidTestImplementation 'com.android.support.test:runner:1.0.2'

‎slices-basic-codelab/step-00/SliceCodelab/app/src/main/java/com/android/example/slicecodelab/MainActivity.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,15 @@
1818

1919
import android.content.Context;
2020
import android.os.Bundle;
21-
import android.support.v4.math.MathUtils;
22-
import android.support.v7.app.AppCompatActivity;
21+
import androidx.appcompat.app.AppCompatActivity;
22+
import androidx.core.math.MathUtils;
23+
2324
import android.view.View;
2425
import android.widget.TextView;
2526

2627
public class MainActivity extends AppCompatActivity implements View.OnClickListener {
2728

28-
public static int sTemperature = 16; // Celcius
29+
public static int sTemperature = 16; // Celsius
2930
private TextView mTextView;
3031

3132
@Override
@@ -65,7 +66,6 @@ public static String getTemperatureString(Context context) {
6566

6667
public static void updateTemperature(Context context, int newValue) {
6768
newValue = MathUtils.clamp(newValue, 10, 30); // Lets keep temperatures reasonable
68-
6969
if (newValue != sTemperature) {
7070
sTemperature = newValue;
7171
}

‎slices-basic-codelab/step-00/SliceCodelab/build.gradle‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ buildscript {
77
jcenter()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:3.1.0'
11-
12-
10+
classpath 'com.android.tools.build:gradle:3.1.2'
1311
// NOTE: Do not place your application dependencies here; they belong
1412
// in the individual module build.gradle files
1513
}

‎slices-basic-codelab/step-01/SliceCodelab/app/build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ android {
44
compileSdkVersion 'android-P'
55
defaultConfig {
66
applicationId "com.android.example.slicecodelab"
7-
minSdkVersion 27
8-
targetSdkVersion 27
7+
minSdkVersion 19
8+
targetSdkVersion 28
99
versionCode 1
1010
versionName "1.0"
1111
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -19,10 +19,10 @@ android {
1919
}
2020

2121
dependencies {
22-
implementation 'com.android.support:slices-core:28.0.0-alpha1'
23-
implementation 'com.android.support:slices-builders:28.0.0-alpha1'
22+
implementation 'androidx.slice:slice-core:1.0.0-alpha1'
23+
implementation 'androidx.slice:slice-builders:1.0.0-alpha1'
2424
implementation fileTree(dir: 'libs', include: ['*.jar'])
25-
implementation 'com.android.support:appcompat-v7:28.0.0-alpha1'
25+
implementation 'androidx.appcompat:appcompat:1.0.0-alpha1'
2626
implementation 'com.android.support.constraint:constraint-layout:1.1.0'
2727
testImplementation 'junit:junit:4.12'
2828
androidTestImplementation 'com.android.support.test:runner:1.0.2'

‎slices-basic-codelab/step-01/SliceCodelab/app/src/main/java/com/android/example/slicecodelab/MainActivity.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,15 @@
1818

1919
import android.content.Context;
2020
import android.os.Bundle;
21-
import android.support.v4.math.MathUtils;
22-
import android.support.v7.app.AppCompatActivity;
2321
import android.view.View;
2422
import android.widget.TextView;
2523

24+
import androidx.appcompat.app.AppCompatActivity;
25+
import androidx.core.math.MathUtils;
26+
2627
public class MainActivity extends AppCompatActivity implements View.OnClickListener {
2728

28-
public static int sTemperature = 16; // Celcius
29+
public static int sTemperature = 16; // Celsius
2930
private TextView mTextView;
3031

3132
@Override

‎slices-basic-codelab/step-01/SliceCodelab/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
jcenter()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:3.1.0'
10+
classpath 'com.android.tools.build:gradle:3.1.1'
1111

1212

1313
// NOTE: Do not place your application dependencies here; they belong

‎slices-basic-codelab/step-02/SliceCodelab/app/build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ android {
44
compileSdkVersion 'android-P'
55
defaultConfig {
66
applicationId "com.android.example.slicecodelab"
7-
minSdkVersion 27
8-
targetSdkVersion 27
7+
minSdkVersion 19
8+
targetSdkVersion 28
99
versionCode 1
1010
versionName "1.0"
1111
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -19,10 +19,10 @@ android {
1919
}
2020

2121
dependencies {
22-
implementation 'com.android.support:slices-core:28.0.0-alpha1'
23-
implementation 'com.android.support:slices-builders:28.0.0-alpha1'
22+
implementation 'androidx.slice:slice-core:1.0.0-alpha1'
23+
implementation 'androidx.slice:slice-builders:1.0.0-alpha1'
2424
implementation fileTree(dir: 'libs', include: ['*.jar'])
25-
implementation 'com.android.support:appcompat-v7:28.0.0-alpha1'
25+
implementation 'androidx.appcompat:appcompat:1.0.0-alpha1'
2626
implementation 'com.android.support.constraint:constraint-layout:1.1.0'
2727
testImplementation 'junit:junit:4.12'
2828
androidTestImplementation 'com.android.support.test:runner:1.0.2'

‎slices-basic-codelab/step-02/SliceCodelab/app/src/main/java/com/android/example/slicecodelab/MainActivity.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,12 @@
1818

1919
import android.content.Context;
2020
import android.os.Bundle;
21-
import android.support.v4.math.MathUtils;
22-
import android.support.v7.app.AppCompatActivity;
2321
import android.view.View;
2422
import android.widget.TextView;
2523

24+
import androidx.appcompat.app.AppCompatActivity;
25+
import androidx.core.math.MathUtils;
26+
2627
public class MainActivity extends AppCompatActivity implements View.OnClickListener {
2728

2829
public static int sTemperature = 16; // Celcius

0 commit comments

Comments
 (0)