Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge pull with updates from API level 21 to API level 28 #117

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 45 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,48 @@
#built application files
*.apk
*.ap_

# files for the dex VM
*.dex

# Java class files
*.class

# built native files (uncomment if you build your own)
# *.o
# *.so

# generated files
bin/
gen/

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

# Proguard folder generated by Eclipse
proguard/

# Eclipse Metadata
.metadata/

# OSX files
.DS_Store

#Screenshot
captures

# Android Studio Projects
*.iml
app/app.iml
.idea
.gradle
/local.properties
/build
.navigation
.idea/gradle.xml
/.idea/workspace.xml
/.idea/tasks.xml
/.idea/libraries
.DS_Store
/build

#NDK
obj/
.externalNativeBuild
23 changes: 0 additions & 23 deletions .idea/compiler.xml

This file was deleted.

7 changes: 4 additions & 3 deletions .idea/encodings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 0 additions & 19 deletions .idea/gradle.xml

This file was deleted.

32 changes: 5 additions & 27 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 2 additions & 5 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion SoundRecorder
Submodule SoundRecorder deleted from c0750b
19 changes: 0 additions & 19 deletions SoundRecorder.iml

This file was deleted.

120 changes: 0 additions & 120 deletions app/app.iml

This file was deleted.

24 changes: 15 additions & 9 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 21
buildToolsVersion '25.0.0'
compileSdkVersion versions.compileSdk
buildToolsVersion "${versions.buildTools}"

defaultConfig {
applicationId "com.danielkim.soundrecorder"
minSdkVersion 16
targetSdkVersion 21
minSdkVersion versions.minSdk
targetSdkVersion versions.targetSdk
versionCode 130
versionName "1.3.0"
}
Expand All @@ -20,12 +20,18 @@ android {
lintOptions{
disable 'MissingTranslation'
}
configurations.all {
resolutionStrategy {
force "com.android.support:support-v4:${versions.support}"
}
}
}

dependencies {
compile 'com.android.support:appcompat-v7:21.0.+'
compile 'com.android.support:cardview-v7:21.0.+'
compile 'com.android.support:recyclerview-v7:21.0.+'
compile 'com.melnykov:floatingactionbutton:1.1.0'
compile 'com.jpardogo.materialtabstrip:library:1.0.6'
implementation "com.android.support:appcompat-v7:${versions.support}"
implementation "com.android.support:cardview-v7:${versions.support}"
implementation "com.android.support:recyclerview-v7:${versions.support}"

implementation "com.melnykov:floatingactionbutton:${versions.floatingActionButton}"
implementation "com.jpardogo.materialtabstrip:library:${versions.materialTabStrip}"
}
Loading