Updated hybrid merging algorithm, added specific

eszdman · eszdman · commit 6dd6f75389e2 · 2023-10-18T07:49:46.000+06:00
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/SupportedList.txt b/app/SupportedList.txt
@@ -9,6 +9,7 @@ xiaomi:apollo
 xiaomi:laurel_sprout
 xiaomi:laurus
 xiaomi:thor
+xiaomi:ishtar
 oneplus:oneplus7
 oneplus:oneplus7t
 oneplus:oneplus7tpro
diff --git a/app/specific/SpecificList.txt b/app/specific/SpecificList.txt
@@ -1,5 +1,6 @@
 xiaomi:dipper
 xiaomi:thor
+xiaomi:ishtar
 oneplus:guacamole
 oneplus:guacamoles
 oneplus:guacamoleb
diff --git a/app/specific/xiaomi/ishtar_specificsettings.txt b/app/specific/xiaomi/ishtar_specificsettings.txt
@@ -0,0 +1 @@
+cameraIDS = {8,1,2,3,4}
diff --git a/app/src/main/jniLibs/arm64-v8a/libhdrxgpu.so b/app/src/main/jniLibs/arm64-v8a/libhdrxgpu.so
diff --git a/app/version.properties b/app/version.properties
@@ -1,2 +1,2 @@
-#Mon Feb 27 11:47:46 MSK 2023
-VERSION_BUILD=15389
+#Wed Oct 18 04:38:51 MSK 2023
+VERSION_BUILD=15441
diff --git a/build.gradle b/build.gradle
@@ -15,7 +15,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath 'com.android.tools.build:gradle:7.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.quinn.hunter:hunter-debug-plugin:1.2.0'
         classpath 'com.quinn.hunter:hunter-transform:1.2.0'
diff --git a/gradle/wrapper/gradle-wrapper.properties b/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.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ buildscript {`
`15`	`15`	`mavenCentral()`
`16`	`16`	`}`
`17`	`17`	`dependencies {`
`18`		`- classpath 'com.android.tools.build:gradle:7.3.1'`
	`18`	`+ classpath 'com.android.tools.build:gradle:7.4.2'`
`19`	`19`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"`
`20`	`20`	`classpath 'com.quinn.hunter:hunter-debug-plugin:1.2.0'`
`21`	`21`	`classpath 'com.quinn.hunter:hunter-transform:1.2.0'`