fix deploy commands (#313)

Author: e7mac

.travis.yml

@@ -3,11 +3,8 @@ android:
   components:
     - tools
     - platform-tools
-    - tools
 
     - build-tools-28.0.3
-
-    # The SDK version used to compile your project
     - android-28
 
     - extra-google-google_play_services
@@ -29,17 +26,18 @@ cache:
 
   before_install:
     - java -v
-    - which docker; echo
 
 script:
-  - make gradlewTravis
+  - make testSDK
 
 after_success:
-  - make releaseArtifacts
+  - make releasePoms
+  - curl -fL https://getcli.jfrog.io | sh ; mv jfrog $HOME/bin
+  - export JFROG_CLI_OFFER_CONFIG=false
 
 deploy:
   - provider: script
+    skip_cleanup: true
     script: ./Tools/deploy.py
     on:
       tags: true
-

Makefile

@@ -4,52 +4,21 @@
 #
 ####################################################################
 
-SDK_BUILD_IMAGE:=leanplum/android-sdk-build:latest
-DOCKER_RUN:=docker run \
-			--tty --interactive --rm \
-			--volume `pwd`/..:/leanplum \
-			--env JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 \
-			--env DEBUG=1 \
-			--workdir /leanplum/Leanplum-Android-SDK \
-			${SDK_BUILD_IMAGE}
-
-clean-local-properties:
-	rm -f local.properties
-
-GRADLE_COMMANDS:=assembleRelease testReleaseUnitTest generatePomFileForAarPublication
-sdk: clean-local-properties
-	gradle clean ${GRADLE_COMMANDS}
-
-sdk-in-container:
-	${DOCKER_RUN} make sdk
-
-shell:
-	${DOCKER_RUN} bash
-
-build-image:
-	docker build -t ${SDK_BUILD_IMAGE} . -f Tools/jenkins/build.dockerfile
-
-.PHONY: build
-
-GRADLE_COMMAND:=assembleDebug testDebugUnitTest assembleRelease generatePomFileForAarPublication
-gradlewTravis:
-	./gradlew ${GRADLE_COMMAND}
+testSDK:
+	./gradlew assembleRelease testReleaseUnitTest
 
 patchReleaseBranch:
 	./Tools/create-release.bash patch
 
-releaseArtifacts: releaseBinaries releasePoms
-
 releaseBinaries:
 	./gradlew assembleRelease
 
 releasePoms:
 	./gradlew generatePomFileForAarPublication
 
-deployArtifacts:
-	./Tools/deploy.py
+releaseArtifacts: releaseBinaries releasePoms
 
 tagCommit:
-	git tag `cat sdk-version.txt`; git push --tags
+	git tag `cat sdk-version.txt`; git push origin `cat sdk-version.txt`
 
-deploy: tagCommit releaseArtifacts deployArtifacts
+deploy: tagCommit

Tools/deploy.py

@@ -30,7 +30,7 @@ def __init__(self, project, package):
             Artifact(
                 "/build/publications/aar/pom-default.xml", "pom"),
             Artifact("/build/outputs/aar/" +
-                     project + "-release.aar", "aar"),
+                    project + ".aar", "aar"),
         ]
 
     def validate(self):
@@ -74,7 +74,7 @@ def deployArtifacts(localPath, artifactoryPath, bintrayPath):
 
 
 def artifactoryDeploy(source, destination):
-    flags = "--url=https://artifactory.leanplum.com --apikey=os.environ['JFROG_CLI_API_KEY']"
+    flags = "--url=https://artifactory.leanplum.com --apikey=" + os.environ['JFROG_CLI_API_KEY']
     command = "jfrog rt u " + source + " " + destination + " " + flags
     # print command
     os.system(command)