upgrade gradle

.gitignore

@@ -1,8 +1,44 @@
+# Created by .ignore support plugin (hsz.mobi)
+### NetBeans template
+nbproject/private/
+build/
+nbbuild/
+dist/
+nbdist/
+nbactions.xml
+nb-configuration.xml
+
+# Mac OS X Garbage
+.DS_Store
+Thumbs.db
+
+.idea/
+
+### Android Studio
+/jniLibs
+mobile/mobile.iml
+mobile/mobile.iml
+tv/tv.iml
+app/app.iml
+app/*.iml
+*.iml
+mobile/*.iml
+tv/*.iml
+.idea/workspace.xml
+.idea/libraries
+.idea/
+.idea
+/build
+/captures
+### Android template
 # Built application files
 *.apk
 *.ap_
-
-# Files for the ART/Dalvik VM
+/build
+/captures
+.externalNativeBuild
+/.externalNativeBuild
+# Files for the Dalvik VM
 *.dex
 
 # Java class files
@@ -11,13 +47,9 @@
 # Generated files
 bin/
 gen/
-out/
 
 # Gradle files
 .gradle/
-build/
-.idea/
-
 
 # Local configuration file (sdk path, etc)
 local.properties
@@ -28,21 +60,59 @@ proguard/
 # Log Files
 *.log
 
-# Android Studio Navigation editor temp files
-.navigation/
 
-# Android Studio captures folder
-captures/
+### Java template
+*.class
 
-# Intellij
-*.iml
-.idea/workspace.xml
+# 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*
+
+
+### Eclipse template
+*.pydevproject
+.metadata
+.gradle
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+.settings/
+.loadpath
+/build
+/captures
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
 
-# Keystore files
-*.jks
+# PDT-specific
+.buildpath
 
-gradlew
+# sbteclipse plugin
+.target
+
+# TeXlipse plugin
+.texlipse
+
+# Android Studio
+*.iml
 
-gradlew
+# Keep external libs
+!app/libs/*.jar
 
-SmallVideoRecord2/copy.sh
+# script output
+check-dpi.txt*

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "SmallVideoRecord1"]
+	path = SmallVideoRecord1
+	url = https://github.com/CMingTseng/mabeijianxi_SmallVideoRecord1.git
+[submodule "SmallVideoRecord2"]
+	path = SmallVideoRecord2
+	url = https://github.com/CMingTseng/mabeijianxi_SmallVideoRecord2.git

SmallVideoRecord1/.gitignore

@@ -1,8 +1,42 @@
+# Created by .ignore support plugin (hsz.mobi)
+### NetBeans template
+nbproject/private/
+build/
+nbbuild/
+dist/
+nbdist/
+nbactions.xml
+nb-configuration.xml
+
+# Mac OS X Garbage
+.DS_Store
+Thumbs.db
+
+.idea/
+
+### Android Studio
+/jniLibs
+mobile/mobile.iml
+mobile/mobile.iml
+tv/tv.iml
+app/app.iml
+app/*.iml
+*.iml
+mobile/*.iml
+tv/*.iml
+.idea/workspace.xml
+.idea/libraries
+.idea/
+.idea
+/build
+/captures
+### Android template
 # Built application files
 *.apk
 *.ap_
-
-# Files for the ART/Dalvik VM
+/build
+/captures
+# Files for the Dalvik VM
 *.dex
 
 # Java class files
@@ -11,13 +45,9 @@
 # Generated files
 bin/
 gen/
-out/
 
 # Gradle files
 .gradle/
-build/
-.idea/
-
 
 # Local configuration file (sdk path, etc)
 local.properties
@@ -28,21 +58,59 @@ proguard/
 # Log Files
 *.log
 
-# Android Studio Navigation editor temp files
-.navigation/
 
-# Android Studio captures folder
-captures/
+### Java template
+*.class
 
-# Intellij
-*.iml
-.idea/workspace.xml
+# 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*
+
+
+### Eclipse template
+*.pydevproject
+.metadata
+.gradle
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+.settings/
+.loadpath
+/build
+/captures
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
 
-# Keystore files
-*.jks
+# PDT-specific
+.buildpath
 
-gradlew
+# sbteclipse plugin
+.target
+
+# TeXlipse plugin
+.texlipse
+
+# Android Studio
+*.iml
 
-gradlew
+# Keep external libs
+!app/libs/*.jar
 
-SmallVideoRecord2/copy.sh
+# script output
+check-dpi.txt*

SmallVideoRecord1/SmallVideoLib/.gitignore

@@ -0,0 +1 @@
+/build

SmallVideoRecord1/SmallVideoLib/build.gradle

@@ -2,12 +2,14 @@ apply plugin: 'com.android.library'
 apply plugin: 'com.novoda.bintray-release'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "23.0.3"
-
+    compileSdkVersion 28
+    buildToolsVersion "29.0.1"
+    lintOptions {
+        abortOnError false
+    }
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 22
+        targetSdkVersion 28
         versionCode 14
         versionName "1.2.2"
     }
@@ -18,12 +20,8 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
     }
-    lintOptions {
-        abortOnError false
-    }
 
     publish {
-
         userOrg = 'mabeijianxi'//bintray.com用户名
         groupId = 'com.mabeijianxi'//jcenter上的路径
         artifactId = 'small-video-record'//项目名称
@@ -32,3 +30,12 @@ android {
         website = 'https://github.com/mabeijianxi/small-video-record'//网站，不重要
     }
 }
+
+dependencies {
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
+        exclude group: 'com.android.support', module: 'support-annotations'
+    })
+
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+}

SmallVideoRecord1/SmallVideoLib/proguard-rules.pro

@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /Users/macdidi5/Library/Android/sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}

SmallVideoRecord1/build.gradle

@@ -2,23 +2,25 @@
 
 buildscript {
     repositories {
+        google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
-        classpath 'com.novoda:bintray-release:0.3.4'
+        classpath 'com.android.tools.build:gradle:3.4.2'
+        classpath 'com.novoda:bintray-release:0.9'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
 }
 
 allprojects {
     repositories {
+        google()
         jcenter()
     }
 }
 
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
-tasks.getByPath(":SmallVideoLib:mavenAndroidJavadocs").enabled = false
+//tasks.getByPath(":SmallVideoLib:mavenAndroidJavadocs").enabled = false

SmallVideoRecord1/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Dec 28 10:00:20 PST 2015
+#Wed May 31 15:40:00 CST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip