Merge pull request #31 from Dynamsoft/01302023-debug

Dynamsoft-Jerson · web-flow · commit 5b02099311ca · 2023-01-31T10:26:52.000+08:00
Fixed Gradle ktx issue
diff --git a/android/Java/DecodeWithCameraX/gradle/wrapper/gradle-wrapper.properties b/android/Java/DecodeWithCameraX/gradle/wrapper/gradle-wrapper.properties
@@ -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-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
diff --git a/android/Java/GeneralSettings/.gitignore b/android/Java/GeneralSettings/.gitignore
@@ -4,8 +4,6 @@
 app/build
 local.properties
 *.aar
-gradle-wrapper.jar
-gradle-wrapper.properties
 gradlew
 gradlew.bat
 .idea
diff --git a/android/Java/GeneralSettings/gradle/wrapper/gradle-wrapper.jar b/android/Java/GeneralSettings/gradle/wrapper/gradle-wrapper.jar
diff --git a/android/Java/GeneralSettings/gradle/wrapper/gradle-wrapper.properties b/android/Java/GeneralSettings/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Jun 13 16:23:19 CST 2022
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
diff --git a/android/Java/HelloWorld/.gitignore b/android/Java/HelloWorld/.gitignore
@@ -4,8 +4,6 @@
 app/build
 local.properties
 *.aar
-gradle-wrapper.jar
-gradle-wrapper.properties
 gradlew
 gradlew.bat
 .idea
diff --git a/android/Java/HelloWorld/app/build.gradle b/android/Java/HelloWorld/app/build.gradle
@@ -1,6 +1,5 @@
 plugins {
     id 'com.android.application'
-    id 'org.jetbrains.kotlin.android'
 }
 
 android {
@@ -38,7 +37,6 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.google.android.material:material:1.2.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    implementation 'androidx.core:core-ktx:+'
     testImplementation 'junit:junit:4.+'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
diff --git a/android/Java/HelloWorld/app/src/main/AndroidManifest.xml b/android/Java/HelloWorld/app/src/main/AndroidManifest.xml
@@ -10,7 +10,6 @@
         android:supportsRtl="true"
         android:usesCleartextTraffic = "true"
         android:theme="@style/Theme.SimpleSample">
-<!--        <activity android:name="com.dynamsoft.helloworld.kotlin.MainActivityKt">-->
         <activity android:name="com.dynamsoft.helloworld.java.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/android/Java/HelloWorld/build.gradle b/android/Java/HelloWorld/build.gradle
@@ -1,16 +1,11 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext {
-        ext.kotlin_version = '1.6.10'
-    }
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.1.2'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
diff --git a/android/Java/HelloWorld/gradle/wrapper/gradle-wrapper.jar b/android/Java/HelloWorld/gradle/wrapper/gradle-wrapper.jar
diff --git a/android/Java/HelloWorld/gradle/wrapper/gradle-wrapper.properties b/android/Java/HelloWorld/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Jun 13 16:23:19 CST 2022
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
diff --git a/android/Java/ImageDecoding/gradle/wrapper/gradle-wrapper.jar b/android/Java/ImageDecoding/gradle/wrapper/gradle-wrapper.jar
diff --git a/android/Java/ImageDecoding/gradle/wrapper/gradle-wrapper.properties b/android/Java/ImageDecoding/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Jan 05 16:34:55 CST 2023
+#Mon Jun 13 16:23:19 CST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
diff --git a/android/Java/PerformanceSettings/.gitignore b/android/Java/PerformanceSettings/.gitignore
@@ -4,8 +4,6 @@
 app/build
 local.properties
 *.aar
-gradle-wrapper.jar
-gradle-wrapper.properties
 gradlew
 gradlew.bat
 .idea
diff --git a/android/Java/PerformanceSettings/gradle/wrapper/gradle-wrapper.jar b/android/Java/PerformanceSettings/gradle/wrapper/gradle-wrapper.jar
diff --git a/android/Java/PerformanceSettings/gradle/wrapper/gradle-wrapper.properties b/android/Java/PerformanceSettings/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Jun 13 16:23:19 CST 2022
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
diff --git a/android/Java/Usecase/ReadADriversLicense/.gitignore b/android/Java/Usecase/ReadADriversLicense/.gitignore
@@ -4,8 +4,6 @@
 app/build
 local.properties
 *.aar
-gradle-wrapper.jar
-gradle-wrapper.properties
 gradlew
 gradlew.bat
 .idea
diff --git a/android/Java/Usecase/ReadADriversLicense/gradle/wrapper/gradle-wrapper.jar b/android/Java/Usecase/ReadADriversLicense/gradle/wrapper/gradle-wrapper.jar
diff --git a/android/Java/Usecase/ReadADriversLicense/gradle/wrapper/gradle-wrapper.properties b/android/Java/Usecase/ReadADriversLicense/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Jun 13 16:23:19 CST 2022
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
diff --git a/android/Java/Usecase/TinyBarcode/.gitignore b/android/Java/Usecase/TinyBarcode/.gitignore
@@ -4,8 +4,6 @@
 app/build
 local.properties
 *.aar
-gradle-wrapper.jar
-gradle-wrapper.properties
 gradlew
 gradlew.bat
 .idea
diff --git a/android/Java/Usecase/TinyBarcode/app/build.gradle b/android/Java/Usecase/TinyBarcode/app/build.gradle
@@ -1,6 +1,5 @@
 plugins {
     id 'com.android.application'
-    id 'org.jetbrains.kotlin.android'
 }
 
 android {
@@ -35,7 +34,6 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.google.android.material:material:1.2.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    implementation 'androidx.core:core-ktx:+'
     testImplementation 'junit:junit:4.+'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
diff --git a/android/Java/Usecase/TinyBarcode/app/src/main/AndroidManifest.xml b/android/Java/Usecase/TinyBarcode/app/src/main/AndroidManifest.xml
@@ -10,7 +10,6 @@
         android:supportsRtl="true"
         android:usesCleartextTraffic = "true"
         android:theme="@style/Theme.SimpleSample">
-<!--        <activity android:name="com.dynamsoft.helloworld.kotlin.MainActivityKt">-->
         <activity android:name="com.dynamsoft.tinybarcode.java.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/android/Java/Usecase/TinyBarcode/build.gradle b/android/Java/Usecase/TinyBarcode/build.gradle
@@ -1,16 +1,11 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext {
-        ext.kotlin_version = '1.6.10'
-    }
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.1.2'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
diff --git a/android/Java/Usecase/TinyBarcode/gradle/wrapper/gradle-wrapper.jar b/android/Java/Usecase/TinyBarcode/gradle/wrapper/gradle-wrapper.jar
diff --git a/android/Java/Usecase/TinyBarcode/gradle/wrapper/gradle-wrapper.properties b/android/Java/Usecase/TinyBarcode/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Jun 13 16:23:19 CST 2022
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
diff --git a/android/JavaScript/WebViewBarcodeScanning/gradle/wrapper/gradle-wrapper.jar b/android/JavaScript/WebViewBarcodeScanning/gradle/wrapper/gradle-wrapper.jar
diff --git a/android/JavaScript/WebViewBarcodeScanning/gradle/wrapper/gradle-wrapper.properties b/android/JavaScript/WebViewBarcodeScanning/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Nov 16 13:44:14 CST 2022
+#Mon Jun 13 16:23:19 CST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
diff --git a/android/Kotlin/HelloWorld/.gitignore b/android/Kotlin/HelloWorld/.gitignore
@@ -4,8 +4,6 @@
 app/build
 local.properties
 *.aar
-gradle-wrapper.jar
-gradle-wrapper.properties
 gradlew
 gradlew.bat
 .idea
diff --git a/android/Kotlin/HelloWorld/app/build.gradle b/android/Kotlin/HelloWorld/app/build.gradle
@@ -34,7 +34,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.google.android.material:material:1.2.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    implementation 'androidx.core:core-ktx:+'
+    implementation 'androidx.core:core-ktx:1.9.0'
     testImplementation 'junit:junit:4.+'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
diff --git a/android/Kotlin/HelloWorld/app/src/main/AndroidManifest.xml b/android/Kotlin/HelloWorld/app/src/main/AndroidManifest.xml
@@ -10,7 +10,6 @@
         android:supportsRtl="true"
         android:usesCleartextTraffic = "true"
         android:theme="@style/Theme.SimpleSample">
-<!--        <activity android:name="com.dynamsoft.helloworld.kotlin.MainActivityKt">-->
         <activity android:name="com.dynamsoft.helloworld.kotlin.MainActivityKt">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/android/Kotlin/HelloWorld/gradle/wrapper/gradle-wrapper.jar b/android/Kotlin/HelloWorld/gradle/wrapper/gradle-wrapper.jar
diff --git a/android/Kotlin/HelloWorld/gradle/wrapper/gradle-wrapper.properties b/android/Kotlin/HelloWorld/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Jun 13 16:23:19 CST 2022
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
