diff --git a/settings.gradle b/settings.gradle index 6ad55e7c..d9d88bf8 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,3 @@ -include ':videoedit2' include ':combined' include ':videoedit' include ':imageedit' diff --git a/videoedit2/.gitignore b/videoedit2/.gitignore deleted file mode 100644 index 42afabfd..00000000 --- a/videoedit2/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/videoedit2/build.gradle b/videoedit2/build.gradle deleted file mode 100644 index 6b895ec4..00000000 --- a/videoedit2/build.gradle +++ /dev/null @@ -1,47 +0,0 @@ -plugins { - id 'com.android.library' - id 'kotlin-android' -} -//============================== JitPack 上传插件配置 ===================== -apply plugin: 'com.github.dcendents.android-maven' -group='com.github.zhongjhATC' - -android { - compileSdkVersion 31 - buildToolsVersion "30.0.3" - - defaultConfig { - minSdkVersion 21 - targetSdkVersion 31 - versionCode 1 - versionName "1.0" - - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles "consumer-rules.pro" - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - kotlinOptions { - jvmTarget = '1.8' - } -} - -dependencies { - - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - implementation 'androidx.core:core-ktx:1.7.0' - implementation 'androidx.appcompat:appcompat:1.3.1' - implementation 'com.google.android.material:material:1.4.0' - testImplementation 'junit:junit:4.+' - androidTestImplementation 'androidx.test.ext:junit:1.1.3' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' -} \ No newline at end of file diff --git a/videoedit2/consumer-rules.pro b/videoedit2/consumer-rules.pro deleted file mode 100644 index e69de29b..00000000 diff --git a/videoedit2/proguard-rules.pro b/videoedit2/proguard-rules.pro deleted file mode 100644 index 481bb434..00000000 --- a/videoedit2/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# 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 *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/videoedit2/src/androidTest/java/com/zhongjh/videoedit2/ExampleInstrumentedTest.kt b/videoedit2/src/androidTest/java/com/zhongjh/videoedit2/ExampleInstrumentedTest.kt deleted file mode 100644 index 709487a2..00000000 --- a/videoedit2/src/androidTest/java/com/zhongjh/videoedit2/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.zhongjh.videoedit2 - -import androidx.test.platform.app.InstrumentationRegistry -import androidx.test.ext.junit.runners.AndroidJUnit4 - -import org.junit.Test -import org.junit.runner.RunWith - -import org.junit.Assert.* - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) -class ExampleInstrumentedTest { - @Test - fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.zhongjh.videoedit2.test", appContext.packageName) - } -} \ No newline at end of file diff --git a/videoedit2/src/main/AndroidManifest.xml b/videoedit2/src/main/AndroidManifest.xml deleted file mode 100644 index 3daab4ae..00000000 --- a/videoedit2/src/main/AndroidManifest.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/videoedit2/src/test/java/com/zhongjh/videoedit2/ExampleUnitTest.kt b/videoedit2/src/test/java/com/zhongjh/videoedit2/ExampleUnitTest.kt deleted file mode 100644 index 3915d325..00000000 --- a/videoedit2/src/test/java/com/zhongjh/videoedit2/ExampleUnitTest.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.zhongjh.videoedit2 - -import org.junit.Test - -import org.junit.Assert.* - -/** - * Example local unit test, which will execute on the development machine (host). - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -class ExampleUnitTest { - @Test - fun addition_isCorrect() { - assertEquals(4, 2 + 2) - } -} \ No newline at end of file