From bcf21991bc208be711987ebd657120c2a27d405f Mon Sep 17 00:00:00 2001 From: florent champigny Date: Thu, 11 May 2017 11:13:50 +0200 Subject: [PATCH] added publish.sh --- .../camerafragment/sample/MainActivityCustoms.java | 4 +++- build.gradle | 12 ++++++------ .../florent37/camerafragment/CameraFragmentApi.java | 2 -- gradle/wrapper/gradle-wrapper.properties | 4 ++-- publish.sh | 2 ++ 5 files changed, 13 insertions(+), 11 deletions(-) create mode 100644 publish.sh diff --git a/app/src/main/java/com/github/florent37/camerafragment/sample/MainActivityCustoms.java b/app/src/main/java/com/github/florent37/camerafragment/sample/MainActivityCustoms.java index a845ce3..c3de537 100644 --- a/app/src/main/java/com/github/florent37/camerafragment/sample/MainActivityCustoms.java +++ b/app/src/main/java/com/github/florent37/camerafragment/sample/MainActivityCustoms.java @@ -188,7 +188,9 @@ public class MainActivityCustoms extends AppCompatActivity { public void onPhotoTaken(byte[] bytes, String filePath) { } - }); + }, + "/storage/self/primary", + "photo0"); } } diff --git a/build.gradle b/build.gradle index e97f618..15ce2a4 100644 --- a/build.gradle +++ b/build.gradle @@ -3,9 +3,9 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.3' + classpath 'com.android.tools.build:gradle:2.3.1' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1' - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0' + classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } @@ -20,9 +20,9 @@ allprojects { //for Continuous Integration ext { - sdk = 24 - buildTools = "24.0.2" + sdk = 25 + buildTools = "25.0.2" minSdk = 10 - libraryVersion = "1.0.5" - supportVersion = "24.0.0" + libraryVersion = "1.0.6" + supportVersion = "25.0.0" } diff --git a/camerafragment/src/main/java/com/github/florent37/camerafragment/CameraFragmentApi.java b/camerafragment/src/main/java/com/github/florent37/camerafragment/CameraFragmentApi.java index c33c769..2c3f974 100644 --- a/camerafragment/src/main/java/com/github/florent37/camerafragment/CameraFragmentApi.java +++ b/camerafragment/src/main/java/com/github/florent37/camerafragment/CameraFragmentApi.java @@ -13,8 +13,6 @@ import com.github.florent37.camerafragment.listeners.CameraFragmentVideoRecordTe public interface CameraFragmentApi { - void takePhotoOrCaptureVideo(CameraFragmentResultListener resultListener); - void takePhotoOrCaptureVideo(CameraFragmentResultListener resultListener, @Nullable String directoryPath, @Nullable String fileName); void openSettingDialog(); diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 04e285f..5b74428 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Dec 28 10:00:20 PST 2015 +#Thu May 11 11:10:14 CEST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip diff --git a/publish.sh b/publish.sh new file mode 100644 index 0000000..3473574 --- /dev/null +++ b/publish.sh @@ -0,0 +1,2 @@ +./gradlew :camerafragment:install +./gradlew :camerafragment:bintrayUpload \ No newline at end of file