Permalink
Browse files

re-organize project structure to use library project

  • Loading branch information...
1 parent 4813396 commit 6638bddbf73eb0228b7e42d9f5089eb39ea8c1f9 @Zhuinden committed Jul 2, 2016
Showing with 177 additions and 5,677 deletions.
  1. +22 −36 build.gradle
  2. 0 {flowless-sample-single-root/app → flow-sample-basic}/.gitignore
  3. +19 −38 flow-sample-basic/build.gradle
  4. 0 {flowless-sample-single-root/app → flow-sample-basic}/proguard-rules.pro
  5. 0 {flowless-sample-master-detail/app → flow}/.gitignore
  6. +18 −20 flow/build.gradle
  7. +0 −3 flow/gradle.properties
  8. BIN flow/gradle/wrapper/gradle-wrapper.jar
  9. +0 −6 flow/gradle/wrapper/gradle-wrapper.properties
  10. +0 −160 flow/gradlew
  11. 0 {flowless-sample-master-detail/app → flow}/proguard-rules.pro
  12. +0 −1 flow/src/main/java/flow/Flow.java
  13. +0 −4 flow/src/main/java/flow/KeyManager.java
  14. +0 −1 flow/src/main/java/flow/preset/ContainerRootDispatcher.java
  15. +0 −5 flow/src/main/java/flow/preset/FlowContainerLifecycleListener.java
  16. +0 −1 flow/src/main/java/flow/preset/SingleRootDispatcher.java
  17. +0 −7 flowless-sample-master-detail/.gitignore
  18. +0 −48 flowless-sample-master-detail/app/build.gradle
  19. +0 −36 flowless-sample-master-detail/app/src/main/java/flow/ActivityUtils.java
  20. +0 −13 flowless-sample-master-detail/app/src/main/java/flow/Bundleable.java
  21. +0 −33 flowless-sample-master-detail/app/src/main/java/flow/ClassKey.java
  22. +0 −23 flowless-sample-master-detail/app/src/main/java/flow/Direction.java
  23. +0 −30 flowless-sample-master-detail/app/src/main/java/flow/Dispatcher.java
  24. +0 −440 flowless-sample-master-detail/app/src/main/java/flow/Flow.java
  25. +0 −60 flowless-sample-master-detail/app/src/main/java/flow/FlowContextWrapper.java
  26. +0 −9 flowless-sample-master-detail/app/src/main/java/flow/FlowIdlingResource.java
  27. +0 −48 flowless-sample-master-detail/app/src/main/java/flow/ForceBundler.java
  28. +0 −271 flowless-sample-master-detail/app/src/main/java/flow/History.java
  29. +0 −80 flowless-sample-master-detail/app/src/main/java/flow/Installer.java
  30. +0 −74 flowless-sample-master-detail/app/src/main/java/flow/InternalContextWrapper.java
  31. +0 −237 flowless-sample-master-detail/app/src/main/java/flow/InternalLifecycleIntegration.java
  32. +0 −60 flowless-sample-master-detail/app/src/main/java/flow/KeyManager.java
  33. +0 −33 flowless-sample-master-detail/app/src/main/java/flow/KeyParceler.java
  34. +0 −30 flowless-sample-master-detail/app/src/main/java/flow/NotPersistent.java
  35. +0 −42 flowless-sample-master-detail/app/src/main/java/flow/Preconditions.java
  36. +0 −115 flowless-sample-master-detail/app/src/main/java/flow/State.java
  37. +0 −56 flowless-sample-master-detail/app/src/main/java/flow/Traversal.java
  38. +0 −30 flowless-sample-master-detail/app/src/main/java/flow/TraversalCallback.java
  39. +0 −53 flowless-sample-master-detail/app/src/main/java/flow/ViewUtils.java
  40. +0 −58 flowless-sample-master-detail/app/src/main/java/flow/preset/BaseDispatcher.java
  41. +0 −139 flowless-sample-master-detail/app/src/main/java/flow/preset/ContainerRootDispatcher.java
  42. +0 −116 flowless-sample-master-detail/app/src/main/java/flow/preset/DispatcherUtils.java
  43. +0 −14 flowless-sample-master-detail/app/src/main/java/flow/preset/FlowActivityCallbacks.java
  44. +0 −69 flowless-sample-master-detail/app/src/main/java/flow/preset/FlowAnimation.java
  45. +0 −21 flowless-sample-master-detail/app/src/main/java/flow/preset/FlowContainerLifecycleListener.java
  46. +0 −95 flowless-sample-master-detail/app/src/main/java/flow/preset/FlowLifecycleProvider.java
  47. +0 −50 flowless-sample-master-detail/app/src/main/java/flow/preset/FlowLifecycles.java
  48. +0 −13 flowless-sample-master-detail/app/src/main/java/flow/preset/LayoutPath.java
  49. +0 −179 flowless-sample-master-detail/app/src/main/java/flow/preset/SingleRootDispatcher.java
  50. +42 −22 flowless-sample-master-detail/build.gradle
  51. +0 −18 flowless-sample-master-detail/gradle.properties
  52. BIN flowless-sample-master-detail/gradle/wrapper/gradle-wrapper.jar
  53. +0 −6 flowless-sample-master-detail/gradle/wrapper/gradle-wrapper.properties
  54. +0 −160 flowless-sample-master-detail/gradlew
  55. +17 −0 flowless-sample-master-detail/proguard-rules.pro
  56. +0 −1 flowless-sample-master-detail/settings.gradle
  57. 0 ...r-detail/{app → }/src/androidTest/java/com/zhuinden/flow_alpha_master_detail/ApplicationTest.java
  58. 0 flowless-sample-master-detail/{app → }/src/main/AndroidManifest.xml
  59. 0 ...ngle-root/app → flowless-sample-master-detail}/src/main/java/com/google/auto/value/AutoValue.java
  60. 0 ...s-sample-master-detail/{app → }/src/main/java/com/zhuinden/flow_alpha_master_detail/IsDetail.java
  61. 0 ...mple-master-detail/{app → }/src/main/java/com/zhuinden/flow_alpha_master_detail/IsFullScreen.java
  62. 0 ...s-sample-master-detail/{app → }/src/main/java/com/zhuinden/flow_alpha_master_detail/IsMaster.java
  63. 0 ...mple-master-detail/{app → }/src/main/java/com/zhuinden/flow_alpha_master_detail/MainActivity.java
  64. 0 ...er-detail/{app → }/src/main/java/com/zhuinden/flow_alpha_master_detail/MasterDetailContainer.java
  65. 0 ...ster-detail/{app → }/src/main/java/com/zhuinden/flow_alpha_master_detail/SinglePaneContainer.java
  66. 0 ...le-master-detail/{app → }/src/main/java/com/zhuinden/flow_alpha_master_detail/paths/FirstKey.java
  67. 0 ...e-master-detail/{app → }/src/main/java/com/zhuinden/flow_alpha_master_detail/paths/FirstView.java
  68. 0 ...er-detail/{app → }/src/main/java/com/zhuinden/flow_alpha_master_detail/paths/FourthDetailKey.java
  69. 0 ...ail/{app → }/src/main/java/com/zhuinden/flow_alpha_master_detail/paths/FourthDetailSecondKey.java
  70. 0 ...il/{app → }/src/main/java/com/zhuinden/flow_alpha_master_detail/paths/FourthDetailSecondView.java
  71. 0 ...r-detail/{app → }/src/main/java/com/zhuinden/flow_alpha_master_detail/paths/FourthDetailView.java
  72. 0 ...er-detail/{app → }/src/main/java/com/zhuinden/flow_alpha_master_detail/paths/FourthMasterKey.java
  73. 0 ...r-detail/{app → }/src/main/java/com/zhuinden/flow_alpha_master_detail/paths/FourthMasterView.java
  74. 0 ...er-detail/{app → }/src/main/java/com/zhuinden/flow_alpha_master_detail/paths/SecondDetailKey.java
  75. 0 ...ail/{app → }/src/main/java/com/zhuinden/flow_alpha_master_detail/paths/SecondDetailSecondKey.java
  76. 0 ...il/{app → }/src/main/java/com/zhuinden/flow_alpha_master_detail/paths/SecondDetailSecondView.java
  77. 0 ...tail/{app → }/src/main/java/com/zhuinden/flow_alpha_master_detail/paths/SecondDetailThirdKey.java
  78. 0 ...ail/{app → }/src/main/java/com/zhuinden/flow_alpha_master_detail/paths/SecondDetailThirdView.java
  79. 0 ...r-detail/{app → }/src/main/java/com/zhuinden/flow_alpha_master_detail/paths/SecondDetailView.java
  80. 0 ...er-detail/{app → }/src/main/java/com/zhuinden/flow_alpha_master_detail/paths/SecondMasterKey.java
  81. 0 ...r-detail/{app → }/src/main/java/com/zhuinden/flow_alpha_master_detail/paths/SecondMasterView.java
  82. 0 ...detail/{app → }/src/main/java/com/zhuinden/flow_alpha_master_detail/paths/ThirdFullScreenKey.java
  83. 0 ...etail/{app → }/src/main/java/com/zhuinden/flow_alpha_master_detail/paths/ThirdFullScreenView.java
  84. 0 flowless-sample-master-detail/{app → }/src/main/res/layout-land/layout_master_detail_container.xml
  85. 0 flowless-sample-master-detail/{app → }/src/main/res/layout/activity_main.xml
  86. 0 flowless-sample-master-detail/{app → }/src/main/res/layout/layout_master_detail_container.xml
  87. 0 flowless-sample-master-detail/{app → }/src/main/res/layout/path_first.xml
  88. 0 flowless-sample-master-detail/{app → }/src/main/res/layout/path_fourth_detail.xml
  89. 0 flowless-sample-master-detail/{app → }/src/main/res/layout/path_fourth_detail_second.xml
  90. 0 flowless-sample-master-detail/{app → }/src/main/res/layout/path_fourth_master.xml
  91. 0 flowless-sample-master-detail/{app → }/src/main/res/layout/path_second_detail.xml
  92. 0 flowless-sample-master-detail/{app → }/src/main/res/layout/path_second_detail_second.xml
  93. 0 flowless-sample-master-detail/{app → }/src/main/res/layout/path_second_detail_third.xml
  94. 0 flowless-sample-master-detail/{app → }/src/main/res/layout/path_second_master.xml
  95. 0 flowless-sample-master-detail/{app → }/src/main/res/layout/path_third_fullscreen.xml
  96. BIN ...-sample-single-root/app → flowless-sample-master-detail}/src/main/res/mipmap-hdpi/ic_launcher.png
  97. BIN ...-sample-single-root/app → flowless-sample-master-detail}/src/main/res/mipmap-mdpi/ic_launcher.png
  98. BIN ...sample-single-root/app → flowless-sample-master-detail}/src/main/res/mipmap-xhdpi/ic_launcher.png
  99. BIN ...ample-single-root/app → flowless-sample-master-detail}/src/main/res/mipmap-xxhdpi/ic_launcher.png
  100. BIN ...mple-single-root/app → flowless-sample-master-detail}/src/main/res/mipmap-xxxhdpi/ic_launcher.png
  101. 0 ...ess-sample-single-root/app → flowless-sample-master-detail}/src/main/res/values-w820dp/dimens.xml
  102. 0 {flowless-sample-single-root/app → flowless-sample-master-detail}/src/main/res/values/colors.xml
  103. 0 {flowless-sample-single-root/app → flowless-sample-master-detail}/src/main/res/values/dimens.xml
  104. 0 flowless-sample-master-detail/{app → }/src/main/res/values/strings.xml
  105. 0 {flowless-sample-single-root/app → flowless-sample-master-detail}/src/main/res/values/styles.xml
  106. 0 ...e-master-detail/{app → }/src/test/java/com/zhuinden/flow_alpha_master_detail/ExampleUnitTest.java
  107. +0 −7 flowless-sample-single-root/.gitignore
  108. +0 −47 flowless-sample-single-root/app/build.gradle
  109. +0 −36 flowless-sample-single-root/app/src/main/java/flow/ActivityUtils.java
  110. +0 −13 flowless-sample-single-root/app/src/main/java/flow/Bundleable.java
  111. +0 −33 flowless-sample-single-root/app/src/main/java/flow/ClassKey.java
  112. +0 −23 flowless-sample-single-root/app/src/main/java/flow/Direction.java
  113. +0 −30 flowless-sample-single-root/app/src/main/java/flow/Dispatcher.java
  114. +0 −440 flowless-sample-single-root/app/src/main/java/flow/Flow.java
  115. +0 −60 flowless-sample-single-root/app/src/main/java/flow/FlowContextWrapper.java
  116. +0 −9 flowless-sample-single-root/app/src/main/java/flow/FlowIdlingResource.java
  117. +0 −48 flowless-sample-single-root/app/src/main/java/flow/ForceBundler.java
  118. +0 −271 flowless-sample-single-root/app/src/main/java/flow/History.java
  119. +0 −80 flowless-sample-single-root/app/src/main/java/flow/Installer.java
  120. +0 −74 flowless-sample-single-root/app/src/main/java/flow/InternalContextWrapper.java
  121. +0 −237 flowless-sample-single-root/app/src/main/java/flow/InternalLifecycleIntegration.java
  122. +0 −60 flowless-sample-single-root/app/src/main/java/flow/KeyManager.java
  123. +0 −33 flowless-sample-single-root/app/src/main/java/flow/KeyParceler.java
  124. +0 −30 flowless-sample-single-root/app/src/main/java/flow/NotPersistent.java
  125. +0 −42 flowless-sample-single-root/app/src/main/java/flow/Preconditions.java
  126. +0 −115 flowless-sample-single-root/app/src/main/java/flow/State.java
  127. +0 −56 flowless-sample-single-root/app/src/main/java/flow/Traversal.java
  128. +0 −30 flowless-sample-single-root/app/src/main/java/flow/TraversalCallback.java
  129. +0 −53 flowless-sample-single-root/app/src/main/java/flow/ViewUtils.java
  130. +0 −58 flowless-sample-single-root/app/src/main/java/flow/preset/BaseDispatcher.java
  131. +0 −139 flowless-sample-single-root/app/src/main/java/flow/preset/ContainerRootDispatcher.java
  132. +0 −116 flowless-sample-single-root/app/src/main/java/flow/preset/DispatcherUtils.java
  133. +0 −14 flowless-sample-single-root/app/src/main/java/flow/preset/FlowActivityCallbacks.java
  134. +0 −69 flowless-sample-single-root/app/src/main/java/flow/preset/FlowAnimation.java
  135. +0 −21 flowless-sample-single-root/app/src/main/java/flow/preset/FlowContainerLifecycleListener.java
  136. +0 −94 flowless-sample-single-root/app/src/main/java/flow/preset/FlowLifecycleProvider.java
  137. +0 −50 flowless-sample-single-root/app/src/main/java/flow/preset/FlowLifecycles.java
  138. +0 −13 flowless-sample-single-root/app/src/main/java/flow/preset/LayoutPath.java
  139. +0 −179 flowless-sample-single-root/app/src/main/java/flow/preset/SingleRootDispatcher.java
  140. +41 −22 flowless-sample-single-root/build.gradle
  141. BIN flowless-sample-single-root/gradle/wrapper/gradle-wrapper.jar
  142. +0 −6 flowless-sample-single-root/gradle/wrapper/gradle-wrapper.properties
  143. +17 −0 flowless-sample-single-root/proguard-rules.pro
  144. +0 −1 flowless-sample-single-root/settings.gradle
  145. 0 ...e-root/{app → }/src/androidTest/java/com/zhuinden/flowless_dispatcher_sample/ApplicationTest.java
  146. 0 flowless-sample-single-root/{app → }/src/main/AndroidManifest.xml
  147. 0 ...ster-detail/app → flowless-sample-single-root}/src/main/java/com/google/auto/value/AutoValue.java
  148. 0 ...s-sample-single-root/{app → }/src/main/java/com/zhuinden/flowless_dispatcher_sample/FirstKey.java
  149. 0 ...-sample-single-root/{app → }/src/main/java/com/zhuinden/flowless_dispatcher_sample/FirstView.java
  150. 0 ...mple-single-root/{app → }/src/main/java/com/zhuinden/flowless_dispatcher_sample/MainActivity.java
  151. 0 ...-sample-single-root/{app → }/src/main/java/com/zhuinden/flowless_dispatcher_sample/SecondKey.java
  152. 0 ...sample-single-root/{app → }/src/main/java/com/zhuinden/flowless_dispatcher_sample/SecondView.java
  153. 0 flowless-sample-single-root/{app → }/src/main/res/layout/activity_main.xml
  154. 0 flowless-sample-single-root/{app → }/src/main/res/layout/path_first.xml
  155. 0 flowless-sample-single-root/{app → }/src/main/res/layout/path_second.xml
  156. BIN ...-sample-master-detail/app → flowless-sample-single-root}/src/main/res/mipmap-hdpi/ic_launcher.png
  157. BIN ...-sample-master-detail/app → flowless-sample-single-root}/src/main/res/mipmap-mdpi/ic_launcher.png
  158. BIN ...sample-master-detail/app → flowless-sample-single-root}/src/main/res/mipmap-xhdpi/ic_launcher.png
  159. BIN ...ample-master-detail/app → flowless-sample-single-root}/src/main/res/mipmap-xxhdpi/ic_launcher.png
  160. BIN ...mple-master-detail/app → flowless-sample-single-root}/src/main/res/mipmap-xxxhdpi/ic_launcher.png
  161. 0 ...ess-sample-master-detail/app → flowless-sample-single-root}/src/main/res/values-w820dp/dimens.xml
  162. 0 {flowless-sample-master-detail/app → flowless-sample-single-root}/src/main/res/values/colors.xml
  163. 0 {flowless-sample-master-detail/app → flowless-sample-single-root}/src/main/res/values/dimens.xml
  164. 0 flowless-sample-single-root/{app → }/src/main/res/values/strings.xml
  165. 0 {flowless-sample-master-detail/app → flowless-sample-single-root}/src/main/res/values/styles.xml
  166. 0 ...e-single-root/{app → }/src/test/java/com/zhuinden/flowless_dispatcher_sample/ExampleUnitTest.java
  167. 0 {flowless-sample-single-root → }/gradle.properties
  168. 0 {flowless-sample-single-root → }/gradlew
  169. +1 −4 settings.gradle
View
@@ -1,43 +1,29 @@
-ext.deps = [
- android_gradle_plugin : 'com.android.tools.build:gradle:1.5.0',
-]
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
-ext.minSdkVersion = 14
-ext.compileSdkVersion = 23
-ext.buildToolsVersion = '23.0.1'
-
-task wrapper(type: Wrapper) {
- gradleVersion = '2.10'
-}
-
-subprojects {
- buildscript {
+buildscript {
repositories {
- mavenCentral()
+ mavenCentral()
+ jcenter()
+ maven {url "https://clojars.org/repo/"}
+ maven { url "https://jitpack.io" }
}
- }
-
- repositories {
- mavenCentral()
- }
-
- group = GROUP
- version = VERSION_NAME
-
- apply plugin: 'maven'
-
- afterEvaluate { project ->
- if (!(project.plugins.hasPlugin('com.android.application') ||
- project.plugins.hasPlugin('com.android.library'))) {
- return
+ dependencies {
+ classpath 'com.android.tools.build:gradle:2.1.0'
+ classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
+ // NOTE: Do not place your application dependencies here; they belong
+ // in the individual module build.gradle files
}
+}
- android {
- lintOptions {
- quiet false
- textReport true
- textOutput 'stdout'
- }
+allprojects {
+ repositories {
+ mavenCentral()
+ jcenter()
+ maven {url "https://clojars.org/repo/"}
+ maven { url "https://jitpack.io" }
}
- }
+}
+
+task clean(type: Delete) {
+ delete rootProject.buildDir
}
@@ -1,46 +1,27 @@
-buildscript {
- dependencies {
- classpath deps.android_gradle_plugin
- }
-}
-
apply plugin: 'com.android.application'
android {
- compileSdkVersion rootProject.ext.compileSdkVersion
- buildToolsVersion rootProject.ext.buildToolsVersion
-
- defaultConfig {
- applicationId "flow.sample.basic"
-
- minSdkVersion rootProject.ext.minSdkVersion
- versionName VERSION_NAME
- testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
- }
-
- buildTypes {
- release {
- minifyEnabled false
+ compileSdkVersion 23
+ buildToolsVersion "23.0.2"
+
+ defaultConfig {
+ applicationId "flow.sample.basic"
+ minSdkVersion 14
+ targetSdkVersion 23
+ versionCode 1
+ versionName "1.0"
+ }
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+ }
}
- }
-
- packagingOptions {
- exclude 'LICENSE.txt'
- }
}
dependencies {
- compile project(':flow')
- compile 'com.android.support:appcompat-v7:23.1.1'
- compile 'com.android.support:design:23.1.1'
- androidTestCompile 'com.android.support.test:runner:0.4'
- androidTestCompile 'com.android.support.test:rules:0.4'
- androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.1'
-}
-
-//noinspection GroovyAssignabilityCheck
-configurations.all {
- resolutionStrategy {
- force 'com.android.support:support-annotations:23.1.1'
- }
+ compile fileTree(dir: 'libs', include: ['*.jar'])
+ testCompile 'junit:junit:4.12'
+ compile 'com.android.support:appcompat-v7:23.4.0'
+ compile project(':flow')
}
File renamed without changes.
View
@@ -1,27 +1,25 @@
-import com.android.builder.core.BuilderConstants;
-
-buildscript {
- dependencies {
- classpath deps.android_gradle_plugin
- }
-}
-
apply plugin: 'com.android.library'
+
android {
- compileSdkVersion rootProject.ext.compileSdkVersion
- buildToolsVersion rootProject.ext.buildToolsVersion
+ compileSdkVersion 23
+ buildToolsVersion "23.0.2"
- defaultConfig {
- minSdkVersion rootProject.ext.minSdkVersion
- versionName VERSION_NAME
- }
+ defaultConfig {
+ minSdkVersion 14
+ targetSdkVersion 23
+ versionCode 1
+ versionName "1.0"
+ }
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+ }
+ }
}
dependencies {
- compile 'com.android.support:support-annotations:23.1.1'
- testCompile 'junit:junit:4.10'
- testCompile 'org.assertj:assertj-core:1.7.1'
- testCompile 'org.mockito:mockito-core:1.10.19'
- testCompile 'org.robolectric:robolectric:3.0'
- testCompile 'org.apache.maven:maven-ant-tasks:2.1.3'
+ compile fileTree(dir: 'libs', include: ['*.jar'])
+ testCompile 'junit:junit:4.12'
+ compile 'com.android.support:support-annotations:23.4.0'
}
@@ -1,3 +0,0 @@
-POM_NAME=Flow
-POM_ARTIFACT_ID=flow
-POM_PACKAGING=jar
Binary file not shown.
@@ -1,6 +0,0 @@
-#Wed Oct 21 11:34:03 PDT 2015
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip
View
@@ -1,160 +0,0 @@
-#!/usr/bin/env bash
-
-##############################################################################
-##
-## Gradle start up script for UN*X
-##
-##############################################################################
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
- echo "$*"
-}
-
-die ( ) {
- echo
- echo "$*"
- echo
- exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
- CYGWIN* )
- cygwin=true
- ;;
- Darwin* )
- darwin=true
- ;;
- MINGW* )
- msys=true
- ;;
-esac
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`"/$link"
- fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
- if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
- # IBM's JDK on AIX uses strange locations for the executables
- JAVACMD="$JAVA_HOME/jre/sh/java"
- else
- JAVACMD="$JAVA_HOME/bin/java"
- fi
- if [ ! -x "$JAVACMD" ] ; then
- die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
- fi
-else
- JAVACMD="java"
- which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
- MAX_FD_LIMIT=`ulimit -H -n`
- if [ $? -eq 0 ] ; then
- if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
- MAX_FD="$MAX_FD_LIMIT"
- fi
- ulimit -n $MAX_FD
- if [ $? -ne 0 ] ; then
- warn "Could not set maximum file descriptor limit: $MAX_FD"
- fi
- else
- warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
- fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
- GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
- APP_HOME=`cygpath --path --mixed "$APP_HOME"`
- CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
- JAVACMD=`cygpath --unix "$JAVACMD"`
-
- # We build the pattern for arguments to be converted via cygpath
- ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
- SEP=""
- for dir in $ROOTDIRSRAW ; do
- ROOTDIRS="$ROOTDIRS$SEP$dir"
- SEP="|"
- done
- OURCYGPATTERN="(^($ROOTDIRS))"
- # Add a user-defined pattern to the cygpath arguments
- if [ "$GRADLE_CYGPATTERN" != "" ] ; then
- OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
- fi
- # Now convert the arguments - kludge to limit ourselves to /bin/sh
- i=0
- for arg in "$@" ; do
- CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
- CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
-
- if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
- eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
- else
- eval `echo args$i`="\"$arg\""
- fi
- i=$((i+1))
- done
- case $i in
- (0) set -- ;;
- (1) set -- "$args0" ;;
- (2) set -- "$args0" "$args1" ;;
- (3) set -- "$args0" "$args1" "$args2" ;;
- (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
- (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
- (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
- (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
- (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
- (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
- esac
-fi
-
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
- JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
@@ -23,7 +23,6 @@
import android.support.annotation.CheckResult;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
-import android.util.Log;
import android.view.View;
import java.util.Iterator;
@@ -16,10 +16,6 @@
package flow;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-
-import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
@@ -11,7 +11,6 @@
import flow.Dispatcher;
import flow.Flow;
-import flow.ForceBundler;
import flow.Traversal;
import flow.TraversalCallback;
@@ -1,10 +1,5 @@
package flow.preset;
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.annotation.CheckResult;
-import android.view.View;
-
/**
* Created by Zhuinden on 2016.07.01..
*/
@@ -13,7 +13,6 @@
import android.view.ViewGroup;
import flow.Direction;
-import flow.Dispatcher;
import flow.Flow;
import flow.ForceBundler;
import flow.Traversal;
Oops, something went wrong.

0 comments on commit 6638bdd

Please sign in to comment.