Skip to content

Commit b35111b

Browse files
author
Igor Ganapolsky
committed
Update gradle versions.
1 parent 2e4b89f commit b35111b

File tree

4 files changed

+229
-23
lines changed

4 files changed

+229
-23
lines changed

‎app/app.iml

Lines changed: 223 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="Java8StreamExample" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="Android-Java-8-Stream-Example" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -12,11 +12,11 @@
1212
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1313
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1414
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15-
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
16-
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugTestSources" />
15+
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
16+
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
1717
<afterSyncTasks>
18+
<task>generateDebugAndroidTestSources</task>
1819
<task>generateDebugSources</task>
19-
<task>generateDebugTestSources</task>
2020
</afterSyncTasks>
2121
<option name="ALLOW_USER_CONFIGURATION" value="false" />
2222
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -28,21 +28,21 @@
2828
</component>
2929
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
3030
<output url="file://$MODULE_DIR$/build/retrolambda/debug" />
31-
<output-test url="file://$MODULE_DIR$/build/retrolambda/debugTest" />
31+
<output-test url="file://$MODULE_DIR$/build/retrolambda/debugAndroidTest" />
3232
<exclude-output />
3333
<content url="file://$MODULE_DIR$">
3434
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
3535
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3636
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3737
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
3838
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
39-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
40-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
41-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
42-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
43-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
44-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
45-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/debug" type="java-test-resource" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
40+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
41+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
42+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
43+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
44+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
45+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
4646
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4747
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4848
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -64,14 +64,15 @@
6464
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
6565
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6666
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
67-
<excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
6867
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
6968
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
7069
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
7170
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
7271
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
7372
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
7473
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
74+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.0.1/jars" />
75+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.0.1/jars" />
7576
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
7677
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
7778
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
@@ -88,11 +89,216 @@
8889
<excludeFolder url="file://$MODULE_DIR$/build/retrolambda" />
8990
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
9091
</content>
91-
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
92+
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
9293
<orderEntry type="sourceFolder" forTests="false" />
9394
<orderEntry type="library" exported="" name="stream-1.0.3" level="project" />
94-
<orderEntry type="library" exported="" name="support-v4-22.2.1" level="project" />
95-
<orderEntry type="library" exported="" name="support-annotations-22.2.1" level="project" />
96-
<orderEntry type="library" exported="" name="appcompat-v7-22.2.1" level="project" />
95+
<orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" />
96+
<orderEntry type="library" exported="" name="appcompat-v7-23.0.1" level="project" />
97+
<orderEntry type="library" exported="" name="support-annotations-23.0.1" level="project" />
98+
</component>
99+
<component name="org.twodividedbyzero.idea.findbugs">
100+
<option name="_basePreferences">
101+
<map>
102+
<entry key="property.analysisEffortLevel" value="default" />
103+
<entry key="property.analyzeAfterAutoMake" value="false" />
104+
<entry key="property.analyzeAfterCompile" value="false" />
105+
<entry key="property.annotationGutterIconEnabled" value="true" />
106+
<entry key="property.annotationSuppressWarningsClass" value="edu.umd.cs.findbugs.annotations.SuppressFBWarnings" />
107+
<entry key="property.annotationTextRangeMarkupEnabled" value="true" />
108+
<entry key="property.exportAsHtml" value="true" />
109+
<entry key="property.exportAsXml" value="true" />
110+
<entry key="property.exportBaseDir" value="" />
111+
<entry key="property.exportCreateArchiveDir" value="false" />
112+
<entry key="property.exportOpenBrowser" value="true" />
113+
<entry key="property.minPriorityToReport" value="Medium" />
114+
<entry key="property.runAnalysisInBackground" value="false" />
115+
<entry key="property.showHiddenDetectors" value="false" />
116+
<entry key="property.toolWindowToFront" value="true" />
117+
</map>
118+
</option>
119+
<option name="_detectors">
120+
<map>
121+
<entry key="AppendingToAnObjectOutputStream" value="true" />
122+
<entry key="AtomicityProblem" value="true" />
123+
<entry key="BadAppletConstructor" value="false" />
124+
<entry key="BadResultSetAccess" value="true" />
125+
<entry key="BadSyntaxForRegularExpression" value="true" />
126+
<entry key="BadUseOfReturnValue" value="true" />
127+
<entry key="BadlyOverriddenAdapter" value="true" />
128+
<entry key="BooleanReturnNull" value="true" />
129+
<entry key="BuildInterproceduralCallGraph" value="false" />
130+
<entry key="BuildObligationPolicyDatabase" value="true" />
131+
<entry key="BuildStringPassthruGraph" value="true" />
132+
<entry key="CallToUnsupportedMethod" value="false" />
133+
<entry key="CalledMethods" value="true" />
134+
<entry key="CheckCalls" value="false" />
135+
<entry key="CheckExpectedWarnings" value="false" />
136+
<entry key="CheckImmutableAnnotation" value="true" />
137+
<entry key="CheckRelaxingNullnessAnnotation" value="true" />
138+
<entry key="CheckTypeQualifiers" value="true" />
139+
<entry key="CloneIdiom" value="true" />
140+
<entry key="ComparatorIdiom" value="true" />
141+
<entry key="ConfusedInheritance" value="true" />
142+
<entry key="ConfusionBetweenInheritedAndOuterMethod" value="true" />
143+
<entry key="CovariantArrayAssignment" value="false" />
144+
<entry key="CrossSiteScripting" value="true" />
145+
<entry key="DefaultEncodingDetector" value="true" />
146+
<entry key="DoInsideDoPrivileged" value="true" />
147+
<entry key="DontCatchIllegalMonitorStateException" value="true" />
148+
<entry key="DontIgnoreResultOfPutIfAbsent" value="true" />
149+
<entry key="DontUseEnum" value="true" />
150+
<entry key="DroppedException" value="true" />
151+
<entry key="DumbMethodInvocations" value="true" />
152+
<entry key="DumbMethods" value="true" />
153+
<entry key="DuplicateBranches" value="true" />
154+
<entry key="EmptyZipFileEntry" value="false" />
155+
<entry key="EqualsOperandShouldHaveClassCompatibleWithThis" value="true" />
156+
<entry key="ExplicitSerialization" value="true" />
157+
<entry key="FieldItemSummary" value="true" />
158+
<entry key="FinalizerNullsFields" value="true" />
159+
<entry key="FindBadCast2" value="true" />
160+
<entry key="FindBadForLoop" value="true" />
161+
<entry key="FindBugsSummaryStats" value="true" />
162+
<entry key="FindCircularDependencies" value="false" />
163+
<entry key="FindComparatorProblems" value="true" />
164+
<entry key="FindDeadLocalStores" value="true" />
165+
<entry key="FindDoubleCheck" value="true" />
166+
<entry key="FindEmptySynchronizedBlock" value="true" />
167+
<entry key="FindFieldSelfAssignment" value="true" />
168+
<entry key="FindFinalizeInvocations" value="true" />
169+
<entry key="FindFloatEquality" value="true" />
170+
<entry key="FindFloatMath" value="false" />
171+
<entry key="FindHEmismatch" value="true" />
172+
<entry key="FindInconsistentSync2" value="true" />
173+
<entry key="FindJSR166LockMonitorenter" value="true" />
174+
<entry key="FindLocalSelfAssignment2" value="true" />
175+
<entry key="FindMaskedFields" value="true" />
176+
<entry key="FindMismatchedWaitOrNotify" value="true" />
177+
<entry key="FindNakedNotify" value="true" />
178+
<entry key="FindNoSideEffectMethods" value="true" />
179+
<entry key="FindNonSerializableStoreIntoSession" value="false" />
180+
<entry key="FindNonSerializableValuePassedToWriteObject" value="false" />
181+
<entry key="FindNonShortCircuit" value="true" />
182+
<entry key="FindNullDeref" value="true" />
183+
<entry key="FindNullDerefsInvolvingNonShortCircuitEvaluation" value="true" />
184+
<entry key="FindOpenStream" value="true" />
185+
<entry key="FindPuzzlers" value="true" />
186+
<entry key="FindRefComparison" value="true" />
187+
<entry key="FindReturnRef" value="true" />
188+
<entry key="FindRoughConstants" value="true" />
189+
<entry key="FindRunInvocations" value="true" />
190+
<entry key="FindSelfComparison" value="true" />
191+
<entry key="FindSelfComparison2" value="true" />
192+
<entry key="FindSleepWithLockHeld" value="true" />
193+
<entry key="FindSpinLoop" value="true" />
194+
<entry key="FindSqlInjection" value="true" />
195+
<entry key="FindTwoLockWait" value="true" />
196+
<entry key="FindUncalledPrivateMethods" value="true" />
197+
<entry key="FindUnconditionalWait" value="true" />
198+
<entry key="FindUninitializedGet" value="true" />
199+
<entry key="FindUnrelatedTypesInGenericContainer" value="true" />
200+
<entry key="FindUnreleasedLock" value="true" />
201+
<entry key="FindUnsatisfiedObligation" value="true" />
202+
<entry key="FindUnsyncGet" value="true" />
203+
<entry key="FindUseOfNonSerializableValue" value="true" />
204+
<entry key="FindUselessControlFlow" value="true" />
205+
<entry key="FindUselessObjects" value="true" />
206+
<entry key="FormatStringChecker" value="true" />
207+
<entry key="FunctionsThatMightBeMistakenForProcedures" value="true" />
208+
<entry key="HugeSharedStringConstants" value="true" />
209+
<entry key="IDivResultCastToDouble" value="true" />
210+
<entry key="IncompatMask" value="true" />
211+
<entry key="InconsistentAnnotations" value="true" />
212+
<entry key="InefficientIndexOf" value="false" />
213+
<entry key="InefficientInitializationInsideLoop" value="false" />
214+
<entry key="InefficientMemberAccess" value="false" />
215+
<entry key="InefficientToArray" value="false" />
216+
<entry key="InfiniteLoop" value="true" />
217+
<entry key="InfiniteRecursiveLoop" value="true" />
218+
<entry key="InheritanceUnsafeGetResource" value="true" />
219+
<entry key="InitializationChain" value="true" />
220+
<entry key="InitializeNonnullFieldsInConstructor" value="true" />
221+
<entry key="InstantiateStaticClass" value="true" />
222+
<entry key="IntCast2LongAsInstant" value="true" />
223+
<entry key="InvalidJUnitTest" value="true" />
224+
<entry key="IteratorIdioms" value="true" />
225+
<entry key="LazyInit" value="true" />
226+
<entry key="LoadOfKnownNullValue" value="true" />
227+
<entry key="LostLoggerDueToWeakReference" value="true" />
228+
<entry key="MethodReturnCheck" value="true" />
229+
<entry key="Methods" value="true" />
230+
<entry key="MultithreadedInstanceAccess" value="true" />
231+
<entry key="MutableEnum" value="true" />
232+
<entry key="MutableLock" value="true" />
233+
<entry key="MutableStaticFields" value="true" />
234+
<entry key="Naming" value="true" />
235+
<entry key="Noise" value="false" />
236+
<entry key="NoiseNullDeref" value="false" />
237+
<entry key="NoteAnnotationRetention" value="true" />
238+
<entry key="NoteCheckReturnValueAnnotations" value="true" />
239+
<entry key="NoteDirectlyRelevantTypeQualifiers" value="true" />
240+
<entry key="NoteJCIPAnnotation" value="true" />
241+
<entry key="NoteNonNullAnnotations" value="false" />
242+
<entry key="NoteNonnullReturnValues" value="false" />
243+
<entry key="NoteSuppressedWarnings" value="true" />
244+
<entry key="NoteUnconditionalParamDerefs" value="true" />
245+
<entry key="NumberConstructor" value="true" />
246+
<entry key="OptionalReturnNull" value="true" />
247+
<entry key="OverridingEqualsNotSymmetrical" value="true" />
248+
<entry key="PreferZeroLengthArrays" value="true" />
249+
<entry key="PublicSemaphores" value="false" />
250+
<entry key="QuestionableBooleanAssignment" value="true" />
251+
<entry key="ReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass" value="true" />
252+
<entry key="ReadReturnShouldBeChecked" value="true" />
253+
<entry key="RedundantConditions" value="true" />
254+
<entry key="RedundantInterfaces" value="true" />
255+
<entry key="ReflectiveClasses" value="true" />
256+
<entry key="RepeatedConditionals" value="true" />
257+
<entry key="ResolveAllReferences" value="false" />
258+
<entry key="RuntimeExceptionCapture" value="true" />
259+
<entry key="SerializableIdiom" value="true" />
260+
<entry key="StartInConstructor" value="true" />
261+
<entry key="StaticCalendarDetector" value="true" />
262+
<entry key="StringConcatenation" value="true" />
263+
<entry key="SuperfluousInstanceOf" value="true" />
264+
<entry key="SuspiciousThreadInterrupted" value="true" />
265+
<entry key="SwitchFallthrough" value="true" />
266+
<entry key="SynchronizationOnSharedBuiltinConstant" value="true" />
267+
<entry key="SynchronizeAndNullCheckField" value="true" />
268+
<entry key="SynchronizeOnClassLiteralNotGetClass" value="true" />
269+
<entry key="SynchronizingOnContentsOfFieldToProtectField" value="true" />
270+
<entry key="TestASM" value="false" />
271+
<entry key="TestDataflowAnalysis" value="false" />
272+
<entry key="TestingGround" value="false" />
273+
<entry key="TestingGround2" value="false" />
274+
<entry key="TrainFieldStoreTypes" value="true" />
275+
<entry key="TrainLongInstantfParams" value="true" />
276+
<entry key="TrainNonNullAnnotations" value="true" />
277+
<entry key="TrainUnconditionalDerefParams" value="true" />
278+
<entry key="URLProblems" value="true" />
279+
<entry key="UncallableMethodOfAnonymousClass" value="true" />
280+
<entry key="UnnecessaryMath" value="true" />
281+
<entry key="UnreadFields" value="true" />
282+
<entry key="UselessSubclassMethod" value="false" />
283+
<entry key="VarArgsProblems" value="true" />
284+
<entry key="VolatileUsage" value="true" />
285+
<entry key="WaitInLoop" value="true" />
286+
<entry key="WrongMapIterator" value="true" />
287+
<entry key="XMLFactoryBypass" value="true" />
288+
</map>
289+
</option>
290+
<option name="_reportCategories">
291+
<map>
292+
<entry key="BAD_PRACTICE" value="true" />
293+
<entry key="CORRECTNESS" value="true" />
294+
<entry key="EXPERIMENTAL" value="true" />
295+
<entry key="I18N" value="true" />
296+
<entry key="MALICIOUS_CODE" value="true" />
297+
<entry key="MT_CORRECTNESS" value="true" />
298+
<entry key="PERFORMANCE" value="true" />
299+
<entry key="SECURITY" value="true" />
300+
<entry key="STYLE" value="true" />
301+
</map>
302+
</option>
97303
</component>
98304
</module>

‎app/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ repositories {
1616
}
1717

1818
android {
19-
compileSdkVersion 22
20-
buildToolsVersion "21.1.2"
19+
compileSdkVersion 23
20+
buildToolsVersion "23.0.1"
2121

2222
compileOptions {
2323
sourceCompatibility JavaVersion.VERSION_1_8
@@ -26,7 +26,7 @@ android {
2626
defaultConfig {
2727
applicationId "com.annimon.java8streamexample"
2828
minSdkVersion 8
29-
targetSdkVersion 22
29+
targetSdkVersion 23
3030
versionCode 2
3131
versionName "1.0.3"
3232
}
@@ -41,5 +41,5 @@ android {
4141
dependencies {
4242
compile fileTree(dir: 'libs', include: ['*.jar'])
4343
compile 'com.annimon:stream:1.0.3'
44-
compile 'com.android.support:appcompat-v7:22.2.1'
44+
compile 'com.android.support:appcompat-v7:23.0.1'
4545
}

‎build.gradle

Lines changed: 1 addition & 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:1.0.0'
8+
classpath 'com.android.tools.build:gradle:1.3.1'
99

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

0 commit comments

Comments
 (0)