From bd4e5c77a060f6415aa75c2e7ae7e83b8b3ec0c6 Mon Sep 17 00:00:00 2001 From: Nathan O'Neal Date: Mon, 9 Apr 2018 15:44:27 -0500 Subject: [PATCH 1/5] bumping version to 1.4.3-SNAPSHOT --- AndroidVault/vault/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AndroidVault/vault/build.gradle b/AndroidVault/vault/build.gradle index dd8874a..3107f33 100644 --- a/AndroidVault/vault/build.gradle +++ b/AndroidVault/vault/build.gradle @@ -5,7 +5,7 @@ apply plugin: 'com.jfrog.bintray' apply plugin: 'com.jfrog.artifactory-upload' group = "com.bottlerocketstudios" -version = "1.4.2" +version = "1.4.3-SNAPSHOT" project.ext.artifactory_artifactid = "vault" project.ext.artifactory_packaging = "jar" From d3189c80cd2589ade8207049c86cd252c006256c Mon Sep 17 00:00:00 2001 From: Nathan O'Neal Date: Tue, 10 Apr 2018 15:43:51 -0500 Subject: [PATCH 2/5] update readme with latest version info --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 73afb1a..62e47e6 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ Add the jcenter repository and include the library in your project with the comp dependencies { ... - compile 'com.bottlerocketstudios:vault:1.4.1' + compile 'com.bottlerocketstudios:vault:1.4.2' } In rare cases where you need to pull a snapshot build to help troubleshoot the develop branch, snapshots are hosted by JFrog. You should not ship a release using the snapshot library as the actual binary referenced by snapshot is going to change with every build of the develop branch. In the best case you will have irreproducible builds. In the worst case, human extinction. In some more likely middle case, you will have buggy or experimental code in your released app. @@ -70,7 +70,7 @@ In rare cases where you need to pull a snapshot build to help troubleshoot the d dependencies { ... - compile 'com.bottlerocketstudios:vault:1.4.2-SNAPSHOT' + compile 'com.bottlerocketstudios:vault:1.4.3-SNAPSHOT' } #### Sample Application From 906ee096fc9d542082904fb67b23fc7ceb4760c5 Mon Sep 17 00:00:00 2001 From: Roger Hu Date: Thu, 15 Nov 2018 15:56:45 -0800 Subject: [PATCH 3/5] Update Gradle --- SampleApplication/build.gradle | 4 +++- SampleApplication/gradle/wrapper/gradle-wrapper.properties | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/SampleApplication/build.gradle b/SampleApplication/build.gradle index 77ce66e..6e8474b 100644 --- a/SampleApplication/build.gradle +++ b/SampleApplication/build.gradle @@ -2,10 +2,11 @@ buildscript { repositories { + google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.3' + classpath 'com.android.tools.build:gradle:3.2.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -14,6 +15,7 @@ buildscript { allprojects { repositories { + google() jcenter() } } diff --git a/SampleApplication/gradle/wrapper/gradle-wrapper.properties b/SampleApplication/gradle/wrapper/gradle-wrapper.properties index 1c39470..48ccacf 100644 --- a/SampleApplication/gradle/wrapper/gradle-wrapper.properties +++ b/SampleApplication/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Sep 21 10:57:50 CDT 2016 +#Thu Nov 15 15:50:16 PST 2018 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-4.6-all.zip From 756abee799b28e3efdb98092016e8defd1bb529f Mon Sep 17 00:00:00 2001 From: Roger Hu Date: Thu, 15 Nov 2018 16:03:00 -0800 Subject: [PATCH 4/5] Bump to Android P --- SampleApplication/app/build.gradle | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/SampleApplication/app/build.gradle b/SampleApplication/app/build.gradle index c4dad48..894b429 100644 --- a/SampleApplication/app/build.gradle +++ b/SampleApplication/app/build.gradle @@ -1,13 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 23 - buildToolsVersion "23.0.3" + compileSdkVersion 28 defaultConfig { applicationId "com.bottlerocketstudios.vaultsampleapplication" minSdkVersion 17 - targetSdkVersion 23 + targetSdkVersion 28 versionCode 1 versionName "1.0" } @@ -29,6 +28,6 @@ repositories { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) testCompile 'junit:junit:4.12' - compile 'com.android.support:appcompat-v7:23.4.0' - compile 'com.bottlerocketstudios:vault:1.4.0-SNAPSHOT' + compile 'com.android.support:appcompat-v7:28.0.0' + compile 'com.bottlerocketstudios:vault:1.4.2' } From 2dc95f030026d94f0b178493a67c2e85318ece33 Mon Sep 17 00:00:00 2001 From: Roger Hu Date: Thu, 15 Nov 2018 16:42:35 -0800 Subject: [PATCH 5/5] Add support for composite builds This way, any changes to the local directory can be immediately used by the sample application. Requires a root build.gradle file though. --- AndroidVault/build.gradle | 2 +- AndroidVault/vault/build.gradle | 9 ++++++++- AndroidVault/vault/src/main/AndroidManifest.xml | 7 ------- SampleApplication/app/build.gradle | 8 ++++---- SampleApplication/settings.gradle | 7 +++++++ 5 files changed, 20 insertions(+), 13 deletions(-) diff --git a/AndroidVault/build.gradle b/AndroidVault/build.gradle index 80dbd81..0abdfe0 100644 --- a/AndroidVault/build.gradle +++ b/AndroidVault/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.0' + classpath 'com.android.tools.build:gradle:3.2.0' classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3' classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:3.1.1' diff --git a/AndroidVault/vault/build.gradle b/AndroidVault/vault/build.gradle index 3107f33..d839275 100644 --- a/AndroidVault/vault/build.gradle +++ b/AndroidVault/vault/build.gradle @@ -19,6 +19,13 @@ project.ext.bundle_name = "vault" android { compileSdkVersion 26 + // Need build types so composite builds will work with sample application + buildTypes { + release { + } + debug { + } + } defaultConfig { minSdkVersion 15 targetSdkVersion 26 @@ -28,7 +35,7 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) + implementation fileTree(dir: 'libs', include: ['*.jar']) } android.libraryVariants.all { variant -> diff --git a/AndroidVault/vault/src/main/AndroidManifest.xml b/AndroidVault/vault/src/main/AndroidManifest.xml index b5cbda4..ad5ed30 100644 --- a/AndroidVault/vault/src/main/AndroidManifest.xml +++ b/AndroidVault/vault/src/main/AndroidManifest.xml @@ -1,11 +1,4 @@ - - - - diff --git a/SampleApplication/app/build.gradle b/SampleApplication/app/build.gradle index 894b429..9109592 100644 --- a/SampleApplication/app/build.gradle +++ b/SampleApplication/app/build.gradle @@ -26,8 +26,8 @@ repositories { dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - testCompile 'junit:junit:4.12' - compile 'com.android.support:appcompat-v7:28.0.0' - compile 'com.bottlerocketstudios:vault:1.4.2' + implementation fileTree(dir: 'libs', include: ['*.jar']) + testImplementation 'junit:junit:4.12' + implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'com.bottlerocketstudios:vault:1.4.2' } diff --git a/SampleApplication/settings.gradle b/SampleApplication/settings.gradle index e7b4def..6280f22 100644 --- a/SampleApplication/settings.gradle +++ b/SampleApplication/settings.gradle @@ -1 +1,8 @@ include ':app' + +rootProject.name='root' +includeBuild('../AndroidVault') { + dependencySubstitution { + substitute module("com.bottlerocketstudios:vault") with project(':vault') + } +} \ No newline at end of file