Skip to content

Commit 639e342

Browse files
author
Asser
committed
Upgraded Lesson 10 to target SDK 26 (Oreo)
1 parent 6a24d26 commit 639e342

File tree

108 files changed

+608
-1467
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+608
-1467
lines changed

‎Lesson10-Hydration-Reminder/T10.01-Exercise-IntentServices/.gitignore‎

Lines changed: 22 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -1,124 +1,41 @@
1+
.DS_Store
12

2-
# Created by https://www.gitignore.io/api/intellij,android,gradle
3-
4-
### Intellij ###
5-
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
6-
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
7-
8-
# User-specific stuff:
9-
.idea/workspace.xml
10-
.idea/tasks.xml
11-
.idea/dictionaries
12-
.idea/vcs.xml
13-
.idea/jsLibraryMappings.xml
14-
15-
# Sensitive or high-churn files:
16-
.idea/dataSources.ids
17-
.idea/dataSources.xml
18-
.idea/dataSources.local.xml
19-
.idea/sqlDataSources.xml
20-
.idea/dynamic.xml
21-
.idea/uiDesigner.xml
22-
23-
# Gradle:
24-
.idea/gradle.xml
25-
.idea/libraries
26-
27-
# Mongo Explorer plugin:
28-
.idea/mongoSettings.xml
29-
30-
## File-based project format:
31-
*.iws
32-
33-
## Plugin-specific files:
34-
35-
# IntelliJ
36-
/out/
37-
38-
# mpeltonen/sbt-idea plugin
39-
.idea_modules/
40-
41-
# JIRA plugin
42-
atlassian-ide-plugin.xml
43-
44-
# Crashlytics plugin (for Android Studio and IntelliJ)
45-
com_crashlytics_export_strings.xml
46-
crashlytics.properties
47-
crashlytics-build.properties
48-
fabric.properties
49-
50-
### Intellij Patch ###
51-
# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
52-
53-
# *.iml
54-
# modules.xml
55-
# .idea/misc.xml
56-
# *.ipr
57-
58-
59-
### Android ###
60-
# Built application files
3+
# built application files
614
*.apk
625
*.ap_
636

64-
# Files for the ART/Dalvik VM
7+
# files for the dex VM
658
*.dex
669

6710
# Java class files
6811
*.class
6912

70-
# Generated files
13+
# generated files
7114
bin/
72-
gen/
7315
out/
16+
gen/
7417

75-
# Gradle files
76-
.gradle/
77-
build/
78-
79-
# Local configuration file (sdk path, etc)
80-
local.properties
81-
82-
# Proguard folder generated by Eclipse
83-
proguard/
18+
# Libraries used by the app
19+
# Can explicitly add if we want, but shouldn't do so blindly. Licenses, bloat, etc.
20+
/libs
8421

85-
# Log Files
86-
*.log
8722

88-
# Android Studio Navigation editor temp files
89-
.navigation/
23+
# Build stuff (auto-generated by android update project ...)
24+
build.xml
25+
ant.properties
26+
local.properties
27+
project.properties
9028

91-
# Android Studio captures folder
92-
captures/
29+
# Eclipse project files
30+
.classpath
31+
.project
9332

94-
# Intellij
33+
# idea project files
34+
.idea/
9535
*.iml
96-
.idea/workspace.xml
97-
.idea/libraries
98-
99-
# Keystore files
100-
*.jks
101-
102-
### Android Patch ###
103-
gen-external-apklibs
104-
36+
*.ipr
37+
*.iws
10538

106-
### Gradle ###
39+
# Gradle-based build
10740
.gradle
108-
/build/
109-
110-
# Ignore Gradle GUI config
111-
gradle-app.setting
112-
113-
# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
114-
!gradle-wrapper.jar
115-
116-
# Cache of project
117-
.gradletasknamecache
118-
119-
# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
120-
# gradle/wrapper/gradle-wrapper.properties
121-
122-
#removing .idea folder
123-
124-
.idea/
41+
build/

‎Lesson10-Hydration-Reminder/T10.01-Exercise-IntentServices/app/.gitignore‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Lesson10-Hydration-Reminder/T10.01-Exercise-IntentServices/app/build.gradle‎

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

33
android {
4-
compileSdkVersion 25
5-
buildToolsVersion "25.0.2"
4+
compileSdkVersion 26
5+
buildToolsVersion "26.0.1"
66
defaultConfig {
77
applicationId "com.example.android.background"
8-
minSdkVersion 10
9-
targetSdkVersion 25
8+
minSdkVersion 14
9+
targetSdkVersion 26
1010
versionCode 1
1111
versionName "1.0"
1212
}
@@ -19,5 +19,5 @@ android {
1919

2020
dependencies {
2121
compile fileTree(include: ['*.jar'], dir: 'libs')
22-
compile 'com.android.support:appcompat-v7:25.1.0'
22+
compile 'com.android.support:appcompat-v7:26.0.1'
2323
}

‎Lesson10-Hydration-Reminder/T10.01-Exercise-IntentServices/build.gradle‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.2.3'
8+
classpath 'com.android.tools.build:gradle:2.3.3'
99

1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files
@@ -19,6 +19,9 @@ allprojects {
1919
}
2020
repositories {
2121
jcenter()
22+
maven {
23+
url "https://maven.google.com"
24+
}
2225
}
2326
}
2427

‎Lesson10-Hydration-Reminder/T10.01-Exercise-IntentServices/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Fri Jan 13 11:41:03 PST 2017
1+
#Mon Sep 25 13:19:01 AEST 2017
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.4-all.zip

‎Lesson10-Hydration-Reminder/T10.01-Solution-IntentServices/.gitignore‎

Lines changed: 22 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -1,124 +1,41 @@
1+
.DS_Store
12

2-
# Created by https://www.gitignore.io/api/intellij,android,gradle
3-
4-
### Intellij ###
5-
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
6-
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
7-
8-
# User-specific stuff:
9-
.idea/workspace.xml
10-
.idea/tasks.xml
11-
.idea/dictionaries
12-
.idea/vcs.xml
13-
.idea/jsLibraryMappings.xml
14-
15-
# Sensitive or high-churn files:
16-
.idea/dataSources.ids
17-
.idea/dataSources.xml
18-
.idea/dataSources.local.xml
19-
.idea/sqlDataSources.xml
20-
.idea/dynamic.xml
21-
.idea/uiDesigner.xml
22-
23-
# Gradle:
24-
.idea/gradle.xml
25-
.idea/libraries
26-
27-
# Mongo Explorer plugin:
28-
.idea/mongoSettings.xml
29-
30-
## File-based project format:
31-
*.iws
32-
33-
## Plugin-specific files:
34-
35-
# IntelliJ
36-
/out/
37-
38-
# mpeltonen/sbt-idea plugin
39-
.idea_modules/
40-
41-
# JIRA plugin
42-
atlassian-ide-plugin.xml
43-
44-
# Crashlytics plugin (for Android Studio and IntelliJ)
45-
com_crashlytics_export_strings.xml
46-
crashlytics.properties
47-
crashlytics-build.properties
48-
fabric.properties
49-
50-
### Intellij Patch ###
51-
# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
52-
53-
# *.iml
54-
# modules.xml
55-
# .idea/misc.xml
56-
# *.ipr
57-
58-
59-
### Android ###
60-
# Built application files
3+
# built application files
614
*.apk
625
*.ap_
636

64-
# Files for the ART/Dalvik VM
7+
# files for the dex VM
658
*.dex
669

6710
# Java class files
6811
*.class
6912

70-
# Generated files
13+
# generated files
7114
bin/
72-
gen/
7315
out/
16+
gen/
7417

75-
# Gradle files
76-
.gradle/
77-
build/
78-
79-
# Local configuration file (sdk path, etc)
80-
local.properties
81-
82-
# Proguard folder generated by Eclipse
83-
proguard/
18+
# Libraries used by the app
19+
# Can explicitly add if we want, but shouldn't do so blindly. Licenses, bloat, etc.
20+
/libs
8421

85-
# Log Files
86-
*.log
8722

88-
# Android Studio Navigation editor temp files
89-
.navigation/
23+
# Build stuff (auto-generated by android update project ...)
24+
build.xml
25+
ant.properties
26+
local.properties
27+
project.properties
9028

91-
# Android Studio captures folder
92-
captures/
29+
# Eclipse project files
30+
.classpath
31+
.project
9332

94-
# Intellij
33+
# idea project files
34+
.idea/
9535
*.iml
96-
.idea/workspace.xml
97-
.idea/libraries
98-
99-
# Keystore files
100-
*.jks
101-
102-
### Android Patch ###
103-
gen-external-apklibs
104-
36+
*.ipr
37+
*.iws
10538

106-
### Gradle ###
39+
# Gradle-based build
10740
.gradle
108-
/build/
109-
110-
# Ignore Gradle GUI config
111-
gradle-app.setting
112-
113-
# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
114-
!gradle-wrapper.jar
115-
116-
# Cache of project
117-
.gradletasknamecache
118-
119-
# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
120-
# gradle/wrapper/gradle-wrapper.properties
121-
122-
#removing .idea folder
123-
124-
.idea/
41+
build/

‎Lesson10-Hydration-Reminder/T10.01-Solution-IntentServices/app/.gitignore‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Lesson10-Hydration-Reminder/T10.01-Solution-IntentServices/app/build.gradle‎

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

33
android {
4-
compileSdkVersion 25
5-
buildToolsVersion "25.0.2"
4+
compileSdkVersion 26
5+
buildToolsVersion "26.0.1"
66
defaultConfig {
77
applicationId "com.example.android.background"
8-
minSdkVersion 10
9-
targetSdkVersion 25
8+
minSdkVersion 14
9+
targetSdkVersion 26
1010
versionCode 1
1111
versionName "1.0"
1212
}
@@ -19,5 +19,5 @@ android {
1919

2020
dependencies {
2121
compile fileTree(include: ['*.jar'], dir: 'libs')
22-
compile 'com.android.support:appcompat-v7:25.1.0'
22+
compile 'com.android.support:appcompat-v7:26.0.1'
2323
}

‎Lesson10-Hydration-Reminder/T10.01-Solution-IntentServices/build.gradle‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.2.3'
8+
classpath 'com.android.tools.build:gradle:2.3.3'
99

1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files
@@ -19,6 +19,9 @@ allprojects {
1919
}
2020
repositories {
2121
jcenter()
22+
maven {
23+
url "https://maven.google.com"
24+
}
2225
}
2326
}
2427

0 commit comments

Comments
 (0)