Skip to content

Commit 0429ed6

Browse files
StylingAndroidStylingAndroid
committed
Adds separate Java7 and Java8 sample projects
1 parent 8f067b8 commit 0429ed6

File tree

42 files changed

+479
-25
lines changed

Some content is hidden

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

42 files changed

+479
-25
lines changed

‎sample/.gitignore‎ renamed to ‎Java7sample/.gitignore‎

File renamed without changes.

‎Java7sample/Java7sample.iml‎

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module external.linked.project.id=":Java7sample" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
3+
<component name="FacetManager">
4+
<facet type="android-gradle" name="Android-Gradle">
5+
<configuration>
6+
<option name="GRADLE_PROJECT_PATH" value=":Java7sample" />
7+
</configuration>
8+
</facet>
9+
<facet type="android" name="Android">
10+
<configuration>
11+
<option name="SELECTED_BUILD_VARIANT" value="debug" />
12+
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
13+
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
14+
<afterSyncTasks>
15+
<task>generateDebugSources</task>
16+
</afterSyncTasks>
17+
<option name="ALLOW_USER_CONFIGURATION" value="false" />
18+
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
19+
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
20+
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
21+
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
22+
</configuration>
23+
</facet>
24+
</component>
25+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
26+
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
27+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
28+
<exclude-output />
29+
<content url="file://$MODULE_DIR$">
30+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
31+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
32+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
33+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
34+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
35+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
36+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
37+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
38+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
40+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
41+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
42+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
43+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
44+
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
45+
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
46+
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
47+
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
48+
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
49+
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
50+
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
51+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
56+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
57+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
58+
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
59+
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
60+
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
61+
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
62+
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
63+
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
64+
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
65+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
66+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
67+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
68+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
69+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
70+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
71+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
72+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
73+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
79+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
80+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
81+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
82+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
83+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
84+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
86+
</content>
87+
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
88+
<orderEntry type="sourceFolder" forTests="false" />
89+
<orderEntry type="library" exported="" scope="TEST" name="byte-buddy-agent-1.6.11" level="project" />
90+
<orderEntry type="library" exported="" scope="TEST" name="runner-0.5" level="project" />
91+
<orderEntry type="library" exported="" scope="TEST" name="byte-buddy-1.6.11" level="project" />
92+
<orderEntry type="library" exported="" scope="TEST" name="espresso-idling-resource-2.2.2" level="project" />
93+
<orderEntry type="library" exported="" name="constraint-layout-1.0.2" level="project" />
94+
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-library-1.3" level="project" />
95+
<orderEntry type="library" exported="" name="transition-25.3.1" level="project" />
96+
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-integration-1.3" level="project" />
97+
<orderEntry type="library" exported="" scope="TEST" name="mockito-core-2.7.22" level="project" />
98+
<orderEntry type="library" exported="" name="design-25.3.1" level="project" />
99+
<orderEntry type="library" exported="" name="support-core-ui-25.3.1" level="project" />
100+
<orderEntry type="library" exported="" scope="TEST" name="objenesis-2.5" level="project" />
101+
<orderEntry type="library" exported="" scope="TEST" name="jsr305-2.0.1" level="project" />
102+
<orderEntry type="library" exported="" name="support-core-utils-25.3.1" level="project" />
103+
<orderEntry type="library" exported="" name="support-fragment-25.3.1" level="project" />
104+
<orderEntry type="library" exported="" scope="TEST" name="espresso-core-2.2.2" level="project" />
105+
<orderEntry type="library" exported="" scope="TEST" name="exposed-instrumentation-api-publish-0.5" level="project" />
106+
<orderEntry type="library" exported="" scope="TEST" name="rules-0.5" level="project" />
107+
<orderEntry type="library" exported="" name="constraint-layout-solver-1.0.2" level="project" />
108+
<orderEntry type="library" exported="" scope="TEST" name="javax.annotation-api-1.2" level="project" />
109+
<orderEntry type="library" exported="" scope="TEST" name="javax.inject-1" level="project" />
110+
<orderEntry type="library" exported="" scope="TEST" name="javawriter-2.1.1" level="project" />
111+
<orderEntry type="library" exported="" scope="TEST" name="assertj-core-3.6.2" level="project" />
112+
<orderEntry type="library" exported="" name="support-v4-25.3.1" level="project" />
113+
<orderEntry type="library" exported="" name="support-media-compat-25.3.1" level="project" />
114+
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
115+
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
116+
<orderEntry type="library" exported="" name="recyclerview-v7-25.3.1" level="project" />
117+
<orderEntry type="library" exported="" name="support-annotations-25.3.1" level="project" />
118+
<orderEntry type="library" exported="" name="appcompat-v7-25.3.1" level="project" />
119+
<orderEntry type="library" exported="" name="support-vector-drawable-25.3.1" level="project" />
120+
<orderEntry type="library" exported="" name="support-compat-25.3.1" level="project" />
121+
<orderEntry type="library" exported="" name="animated-vector-drawable-25.3.1" level="project" />
122+
<orderEntry type="module" module-name="viewpageranimator" exported="" />
123+
</component>
124+
</module>

‎Java7sample/build.gradle‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
apply plugin: 'com.android.application'
2+
3+
android {
4+
compileSdkVersion 25
5+
buildToolsVersion '25.0.2'
6+
defaultConfig {
7+
applicationId "com.stylingandroid.viewpageranimator.sample"
8+
minSdkVersion rootProject.minSdkVersion
9+
targetSdkVersion rootProject.targetSdkVersion
10+
versionCode rootProject.versionCode
11+
versionName "${rootProject.versionName}"
12+
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
13+
}
14+
buildTypes {
15+
release {
16+
minifyEnabled false
17+
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
18+
}
19+
}
20+
testOptions {
21+
unitTests.returnDefaultValues = false
22+
}
23+
// compileOptions {
24+
// sourceCompatibility JavaVersion.VERSION_1_8
25+
// targetCompatibility JavaVersion.VERSION_1_8
26+
// }
27+
}
28+
29+
dependencies {
30+
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
31+
exclude group: 'com.android.support', module: 'support-annotations'
32+
})
33+
compile "com.android.support:appcompat-v7:${rootProject.supportLibrary}"
34+
compile "com.android.support:design:${rootProject.supportLibrary}"
35+
testCompile 'junit:junit:4.12'
36+
testCompile "org.assertj:assertj-core:${rootProject.assertj}"
37+
testCompile 'org.mockito:mockito-core:2.7.22'
38+
compile "com.android.support.constraint:constraint-layout:${rootProject.constraintLayout}"
39+
compile project(':viewpageranimator')
40+
}
41+
42+
apply from: '../config/static_analysis.gradle'

‎sample/proguard-rules.pro‎ renamed to ‎Java7sample/proguard-rules.pro‎

File renamed without changes.

‎sample/src/main/AndroidManifest.xml‎ renamed to ‎Java7sample/src/main/AndroidManifest.xml‎

File renamed without changes.

‎sample/src/main/java/com/stylingandroid/viewpageranimator/sample/MainActivity.java‎ renamed to ‎Java7sample/src/main/java/com/stylingandroid/viewpageranimator/sample/MainActivity.java‎

File renamed without changes.

‎sample/src/main/java/com/stylingandroid/viewpageranimator/sample/adapter/PagerAdapter.java‎ renamed to ‎Java7sample/src/main/java/com/stylingandroid/viewpageranimator/sample/adapter/PagerAdapter.java‎

File renamed without changes.

‎sample/src/main/java/com/stylingandroid/viewpageranimator/sample/adapter/PagerAdapterFactory.java‎ renamed to ‎Java7sample/src/main/java/com/stylingandroid/viewpageranimator/sample/adapter/PagerAdapterFactory.java‎

File renamed without changes.

‎sample/src/main/java/com/stylingandroid/viewpageranimator/sample/adapter/PagerFragment.java‎ renamed to ‎Java7sample/src/main/java/com/stylingandroid/viewpageranimator/sample/adapter/PagerFragment.java‎

File renamed without changes.

‎sample/src/main/java/com/stylingandroid/viewpageranimator/sample/adapter/PagerItem.java‎ renamed to ‎Java7sample/src/main/java/com/stylingandroid/viewpageranimator/sample/adapter/PagerItem.java‎

File renamed without changes.

0 commit comments

Comments
 (0)