Removed CPP methods, as they are translated in java.

ltrudu · Dec 20, 2024 · cbb95fe · cbb95fe
1 parent e894386
commit cbb95fe
Show file tree

Hide file tree

Showing 13 changed files with 315 additions and 937 deletions.
diff --git a/PrintWrapper/build.gradle b/PrintWrapper/build.gradle
@@ -8,32 +8,22 @@ plugins {
 ext {
     PUBLISH_GROUP_ID = 'com.zebra.printwrapper'
     PUBLISH_ARTIFACT_ID = 'printwrapper'
-    PUBLISH_VERSION = '1.15'
+    PUBLISH_VERSION = '1.16'
 }
 
 android {
     namespace 'com.zebra.printwrapper'
 
-    ndkVersion '28.0.12674087 rc2'
     compileSdkVersion 34
 
     defaultConfig {
         minSdkVersion 24
         targetSdkVersion 34
-        versionCode 15
-        versionName "1.15"
+        versionCode 16
+        versionName "1.16"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
-
-        externalNativeBuild {
-            cmake {
-                cppFlags "-std=c++14"
-            }
-        }
-        ndk {
-            abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
-        }
     }
 
     buildTypes {
@@ -46,12 +36,6 @@ android {
             debuggable true
         }
     }
-    externalNativeBuild {
-        cmake {
-            path "src/main/cpp/CMakeLists.txt"
-            version "3.22.1"
-        }
-    }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8

diff --git a/PrintWrapper/proguard-rules.pro b/PrintWrapper/proguard-rules.pro
@@ -19,20 +19,3 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
-
-#-renamesourcefileattribute SourceFile
-#noinspection ShrinkerUnresolvedReference
--keepclassmembers class **.RasterizationHelper {
-    native <methods>;
-    #noinspection ShrinkerUnresolvedReference
-    String getUtilsVersion();
-    #noinspection ShrinkerUnresolvedReference,ShrinkerUnresolvedReference
-    String createBitmapZPL(Bitmap);
-    #noinspection ShrinkerUnresolvedReference,ShrinkerUnresolvedReference
-    String createBitmapCPC(Bitmap);
-}
-
-# Parceler library
--keep interface org.parceler.Parcel
--keep @org.parceler.Parcel class * { *; }
--keep class **$$Parcelable { *; }
diff --git a/PrintWrapper/src/main/cpp/CMakeLists.txt b/PrintWrapper/src/main/cpp/CMakeLists.txt
diff --git a/PrintWrapper/src/main/cpp/CPCHelper.cpp b/PrintWrapper/src/main/cpp/CPCHelper.cpp
diff --git a/PrintWrapper/src/main/cpp/Internal.h b/PrintWrapper/src/main/cpp/Internal.h