Skip to content

Commit

Permalink
updating repositiory
Browse files Browse the repository at this point in the history
  • Loading branch information
saki4510t committed Nov 17, 2016
1 parent 1f0b3d1 commit 847ddd4
Show file tree
Hide file tree
Showing 103 changed files with 2,734 additions and 5,508 deletions.
65 changes: 50 additions & 15 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,34 +1,69 @@
# IntelliJ
.idea/workspace.xml
.idea/tasks.xml
.idea/libraries/
# built application files
*.apk
*.ap_

# files for the dex VM
*.dex

# Java class files
*.class

# Mobile Tools for Java (J2ME)
.mtj.tmp/

# Package Files #
*.jar
*.war
*.ear

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*

# generated files
bin/
obj
obj/local
gen/
bin/dexedLibs
bin/res
bin/*.xml
bin/classes
bin/res
bin/AndroidManifest.xml
bin/dexedLibs
bin/jarlist.cache
*.cache

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

# Eclipse project files
.classpath
.project

# Proguard folder generated by Eclipse
proguard/

# Intellij project files
*.iml
*.ipr
*.iws

# Gradle
.gradle/
.gradle
build/
local.properties
build

# gedit
*~
libuvccamera/src/main/libs

.idea/*.xml
!.idea/codeStyleSettings.xml
!.idea/copyright/*.xml
!.idea/fileColors.xml
!.idea/encodings.xml
!.idea/gradle.xml
!.idea/runConfigurations/*.xml

!.idea/inspectionProfiles/*.xml
.idea/inspectionProfiles/profiles_settings.xml

!.idea/scopes/*.xml
.idea/scopes/scope_settings.xml

!.idea/templateLanguages.xml
!.idea/vcs.xml
profiles_settings.xml
.idea/libraries
1 change: 0 additions & 1 deletion .idea/.name

This file was deleted.

2 changes: 1 addition & 1 deletion .idea/compiler.xml

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

6 changes: 6 additions & 0 deletions .idea/encodings.xml

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

8 changes: 4 additions & 4 deletions .idea/gradle.xml

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

46 changes: 15 additions & 31 deletions .idea/inspectionProfiles/Project_Default.xml

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

55 changes: 34 additions & 21 deletions .idea/misc.xml

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

3 changes: 2 additions & 1 deletion .idea/modules.xml

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

2 changes: 1 addition & 1 deletion .idea/vcs.xml

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

2 changes: 1 addition & 1 deletion UVCCamera.iml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
</content>
<orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
14 changes: 13 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,24 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.1.0'
classpath 'com.android.tools.build:gradle:2.2.2'
}
}

allprojects {
repositories {
maven { url 'http://raw.github.com/saki4510t/libcommon/master/repository/' }
jcenter()
}
}

ext {
supportLibVersion = '25.0.0' // variable that can be referenced to keep support libs consistent
commonLibVersion= '1.1.9'
versionBuildTool = '24.0.3'
versionCompiler = 25
versionTarget = 23
versionNameString = '1.0.0'
javaSourceCompatibility = JavaVersion.VERSION_1_7
javaTargetCompatibility = JavaVersion.VERSION_1_7
}
Loading

0 comments on commit 847ddd4

Please sign in to comment.