Skip to content

Commit

Permalink
Delete Visa and Mastercard "drawable" image. (#36)
Browse files Browse the repository at this point in the history
* Delete Visa and Mastercard "drawable" image.
Update SDK and libraries

* Update support library to stable version.

* Update .gitignore and Android Gradle

* Update travis.yml
  • Loading branch information
javichaques authored and vinaygaba committed Sep 27, 2018
1 parent db77a22 commit 46527ce
Show file tree
Hide file tree
Showing 10 changed files with 142 additions and 277 deletions.
134 changes: 128 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,128 @@
/.idea
/build
/local.properties
.gradle
CreditCardView.iml
.DS_Store
### Android template
# Built application files
*.apk
*.ap_

# Files for the ART/Dalvik VM
*.dex

# Java class files
*.class

# Generated files
bin/
gen/
out/

# Gradle files
.gradle/
build/

# Local configuration file (sdk path, etc)
local.properties

# Proguard folder generated by Eclipse
proguard/

# Log Files
*.log

# Android Studio Navigation editor temp files
.navigation/

# Android Studio captures folder
captures/

# IntelliJ
*.iml
.idea/workspace.xml
.idea/tasks.xml
.idea/gradle.xml
.idea/assetWizardSettings.xml
.idea/dictionaries
.idea/libraries
.idea/caches

# Keystore files
# Uncomment the following line if you do not want to check your keystore files in.
#*.jks

# External native build folder generated in Android Studio 2.2 and later
.externalNativeBuild

# Google Services (e.g. APIs or Firebase)
google-services.json

# Freeline
freeline.py
freeline/
freeline_project_description.json

# fastlane
fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots
fastlane/test_output
fastlane/readme.md

### JetBrains template
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

# User-specific stuff
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/**/usage.statistics.xml
.idea/**/dictionaries
.idea/**/shelf

# Sensitive or high-churn files
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
.idea/**/dbnavigator.xml

# Gradle
.idea/**/gradle.xml
.idea/**/libraries

# Gradle and Maven with auto-import
# When using Gradle or Maven with auto-import, you should exclude module files,
# since they will be recreated, and may cause churn. Uncomment if using
# auto-import.
# .idea/modules.xml
# .idea/*.iml
# .idea/modules

# CMake
cmake-build-*/

# Mongo Explorer plugin
.idea/**/mongoSettings.xml

# File-based project format
*.iws

# IntelliJ
out/

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Cursive Clojure plugin
.idea/replstate.xml

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties

# Editor-based Rest Client
.idea/httpRequests
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ android:
- tools

# The BuildTools version used by your project
- build-tools-27.0.3
- build-tools-28.0.2

# The SDK version used to compile your project
- android-27
- android-28

# Additional components
- extra-google-google_play_services
Expand Down
3 changes: 2 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ buildscript {
url 'https://maven.google.com/'
name 'Google'
}
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.2'
classpath 'com.android.tools.build:gradle:3.2.0'


// NOTE: Do not place your application dependencies here; they belong
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl = https\://services.gradle.org/distributions/gradle-4.4-all.zip
distributionUrl = https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
11 changes: 5 additions & 6 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,13 @@ apply plugin: 'com.android.library'
version = "1.0.4"

android {
compileSdkVersion 27
buildToolsVersion '27.0.3'
compileSdkVersion 28

defaultConfig {
minSdkVersion 14
targetSdkVersion 27
targetSdkVersion 28
versionCode 2
versionName "1.0.4"
versionName "1.0.5"
}

buildTypes {
Expand All @@ -27,9 +26,9 @@ android {

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.nineoldandroids:library:2.4.0'
implementation 'com.android.support:support-annotations:27.1.1'
implementation 'com.android.support:support-annotations:28.0.0'
}

//apply from: '../maven_push.gradle'
132 changes: 0 additions & 132 deletions library/library.iml

This file was deleted.

Binary file removed library/src/main/res/drawable/mastercard.png
Binary file not shown.
Binary file removed library/src/main/res/drawable/visa.png
Binary file not shown.
9 changes: 4 additions & 5 deletions sample/build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 27
buildToolsVersion '27.0.3'
compileSdkVersion 28

defaultConfig {
applicationId "com.vinaygaba.creditcardview.sample"
minSdkVersion 14
targetSdkVersion 27
targetSdkVersion 28
versionCode 2
versionName "1.0.3"
versionName "1.0.5"
}
buildTypes {
release {
Expand All @@ -27,5 +26,5 @@ dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
//implementation 'com.vinaygaba:creditcardview:1.0.2'
implementation project(':library')
implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'com.android.support:appcompat-v7:28.0.0'
}
Loading

0 comments on commit 46527ce

Please sign in to comment.