Merge pull request #19 from Instamojo/develop

Release v2.0.1

.circleci/config.yml

@@ -1,15 +1,15 @@
+defaults: &defaults
+  working_directory: ~/imojo
+  docker:
+  - image: circleci/openjdk:8-jdk
+  environment:
+    JVM_OPTS: -Xmx3200m
+    TERM: dumb
+
 version: 2
 jobs:
  build:
-   working_directory: ~/imojo
-
-   docker:
-     - image: circleci/openjdk:8-jdk
-
-   environment:
-     JVM_OPTS: -Xmx3200m
-     TERM: dumb
-
+   <<: *defaults
    steps:
      - checkout
 
@@ -38,4 +38,39 @@ jobs:
         when: always
 
      - store_test_results:
-         path: ~/test-results
+         path: ~/test-results
+
+ release:
+   <<: *defaults
+   steps:
+    - checkout
+    - restore_cache:
+       key: jars-{{ checksum "build.gradle" }}-{{ checksum  "instamojo-java/build.gradle" }}
+    - run:
+       name: Download Dependencies
+       command: gradle dependencies
+    - save_cache:
+       paths:
+       - ~/.gradle
+       key: jars-{{ checksum "build.gradle" }}-{{ checksum  "instamojo-java/build.gradle" }}
+    - run:
+       name: Publish to Bintray
+       command: gradle bintrayUpload
+
+workflows:
+  version: 2
+  build-and-release:
+    jobs:
+    - build:
+        filters:
+          # By default a build is only triggered on commits. Lets build for any tag too.
+          tags:
+            only: /.*/
+    - release:
+        requires:
+          - build
+        filters:
+          tags:
+            only: /^v.*/
+          branches:
+            ignore: /.*/

bintrayv1.gradle → bintray.gradle

@@ -29,17 +29,9 @@ artifacts {
     archives sourcesJar
 }
 
-// Bintray
-Properties properties = new Properties()
-try {
-    properties.load(project.rootProject.file('local.properties').newDataInputStream())
-} catch (Exception e){
-    return
-}
-
 bintray {
-    user = properties.getProperty("bintray.user")
-    key = properties.getProperty("bintray.apikey")
+    user = System.getenv("BINTRAY_USER")
+    key = System.getenv("BINTRAY_KEY")
 
     configurations = ['archives']
     pkg {
@@ -55,9 +47,9 @@ bintray {
             desc = libraryDescription
             gpg {
                 sign = true //Determines whether to GPG sign the files. The default is false
-                passphrase = properties.getProperty("bintray.gpg.password")
+                passphrase = System.getenv("BINTRAY_GPG_PASSWORD")
                 //Optional. The passphrase for GPG signing'
             }
         }
     }
-}
+}

build.gradle

@@ -1,5 +1,5 @@
 group 'com.instamojo'
-version '2.0.0'
+version '2.0.1'
 
 apply plugin: 'java'
 
@@ -34,7 +34,7 @@ ext {
     siteUrl = 'https://github.com/Instamojo/instamojo-java'
     gitUrl = 'https://github.com/Instamojo/instamojo-java.git'
 
-    libraryVersion = '2.0.0'
+    libraryVersion = '2.0.1'
     developerId = 'vijith'
     developerName = 'Vijith Kumar'
     developerEmail = '[email protected]'
@@ -57,5 +57,5 @@ dependencies {
     compile group: 'com.google.code.gson', name: 'gson', version: '2.6.2'
 }
 
-apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle'
-apply from: './bintrayv1.gradle'
+apply from: './install.gradle'
+apply from: './bintray.gradle'

install.gradle

@@ -0,0 +1,42 @@
+apply plugin: 'com.github.dcendents.android-maven'
+
+group = publishedGroupId                               // Maven Group ID for the artifact
+
+install {
+    repositories.mavenInstaller {
+        // This generates POM.xml with proper parameters
+        pom {
+                project {
+                    packaging 'aar'
+                    groupId publishedGroupId
+                    artifactId artifact
+
+                    // Add your description here
+                    name libraryName
+                    description libraryDescription
+                    url siteUrl
+
+                    // Set your license
+                    licenses {
+                        license {
+                            name licenseName
+                            url licenseUrl
+                        }
+                    }
+                    developers {
+                        developer {
+                            id developerId
+                            name developerName
+                            email developerEmail
+                        }
+                    }
+                    scm {
+                        connection gitUrl
+                        developerConnection gitUrl
+                        url siteUrl
+
+                    }
+                }
+        }
+    }
+}

src/main/java/com/instamojo/wrapper/util/Constants.java

@@ -15,7 +15,7 @@ private Constants() {
      * The Constant INSTAMOJO_API_ENDPOINT. Every API request is made to a
      * method on top of this base URL. HTTPS is mandatory.
      */
-    public static final String INSTAMOJO_LIVE_API_ENDPOINT = "https://www.instamojo.com/v2/";
+    public static final String INSTAMOJO_LIVE_API_ENDPOINT = "https://api.instamojo.com/v2/";
 
     public static final String INSTAMOJO_TEST_API_ENDPOINT = "https://test.instamojo.com/v2/";