From 18d79c6f06de964819d730f416cc41a801e7e6cf Mon Sep 17 00:00:00 2001
From: Romain Guy <romainguy@curious-creature.com>
Date: Thu, 9 Feb 2023 10:25:01 -0800
Subject: [PATCH] Add support for Android 14 Developer Preview 1

---
 .idea/androidTestResultsUserPreferences.xml | 13 ++++++++
 .idea/gradle.xml                            |  2 +-
 README.md                                   |  7 +++-
 build.gradle                                |  6 ++--
 gradle.properties                           |  2 +-
 gradle/wrapper/gradle-wrapper.properties    |  4 +--
 pathway/build.gradle                        |  8 ++---
 pathway/src/main/cpp/Path.h                 | 37 +++++++++++++++++----
 pathway/src/main/cpp/pathway.cpp            | 23 ++++++++++---
 9 files changed, 78 insertions(+), 24 deletions(-)

diff --git a/.idea/androidTestResultsUserPreferences.xml b/.idea/androidTestResultsUserPreferences.xml
index 543d099..1ee7502 100644
--- a/.idea/androidTestResultsUserPreferences.xml
+++ b/.idea/androidTestResultsUserPreferences.xml
@@ -43,6 +43,19 @@
             </AndroidTestResultsTableState>
           </value>
         </entry>
+        <entry key="2031611294">
+          <value>
+            <AndroidTestResultsTableState>
+              <option name="preferredColumnWidths">
+                <map>
+                  <entry key="Duration" value="90" />
+                  <entry key="Pixel_5_API_34" value="120" />
+                  <entry key="Tests" value="360" />
+                </map>
+              </option>
+            </AndroidTestResultsTableState>
+          </value>
+        </entry>
       </map>
     </option>
   </component>
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 3da1aea..de83fc7 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="Embedded JDK" />
+        <option name="gradleJvm" value="Android Studio default JDK" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/README.md b/README.md
index 948a72d..807584d 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'dev.romainguy:pathway:0.10.0'
+    implementation 'dev.romainguy:pathway:0.11.0'
 }
 ```
 
@@ -68,6 +68,11 @@ properly honor the path's fill type.
 
 ## Iterating over a Path
 
+> **Note**
+> As of Android 14 (tentatively API 34), iterating over a `Path` can be achieved using the new
+> platform API [getPathIterator()](https://developer.android.com/reference/android/graphics/Path#getPathIterator()).
+> Pathway is however compatible with Android 14, including Developer Preview builds.
+
 With Pathway you can easily iterate over a `Path` object to inspect its segments
 (curves or commands):
 
diff --git a/build.gradle b/build.gradle
index bcfd73b..ca9af05 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,9 +5,9 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:7.3.1"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20"
-        classpath "com.vanniktech:gradle-maven-publish-plugin:0.22.0"
+        classpath "com.android.tools.build:gradle:7.4.1"
+        classpath "com.vanniktech:gradle-maven-publish-plugin:0.24.0"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0"
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.7.20"
     }
 
diff --git a/gradle.properties b/gradle.properties
index f433745..97b7ac6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 GROUP=dev.romainguy
-VERSION_NAME=0.10.0
+VERSION_NAME=0.11.0
 
 SONATYPE_HOST=S01
 RELEASE_SIGNING_ENABLED=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 529ad03..e3986c6 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Oct 06 13:51:03 PDT 2022
+#Thu Feb 09 09:14:05 PST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/pathway/build.gradle b/pathway/build.gradle
index 81c246d..35edb6b 100644
--- a/pathway/build.gradle
+++ b/pathway/build.gradle
@@ -8,12 +8,12 @@ group = GROUP
 version = VERSION_NAME
 
 android {
-    compileSdk 33
+    compileSdkPreview 'UpsideDownCake'
     ndkVersion '25.1.8937393'
 
     defaultConfig {
         minSdk 21
-        targetSdk 33
+        targetSdk 34
 
         externalNativeBuild {
             cmake {
@@ -43,9 +43,9 @@ android {
 
 dependencies {
     androidTestImplementation 'androidx.core:core-ktx:1.9.0'
-    androidTestImplementation 'androidx.test:runner:1.5.1'
+    androidTestImplementation 'androidx.test:runner:1.5.2'
     androidTestImplementation 'androidx.test:rules:1.5.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.4'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
 }
 
 apply plugin: "com.vanniktech.maven.publish"
diff --git a/pathway/src/main/cpp/Path.h b/pathway/src/main/cpp/Path.h
index 630795e..9ae5b5a 100644
--- a/pathway/src/main/cpp/Path.h
+++ b/pathway/src/main/cpp/Path.h
@@ -17,6 +17,8 @@
 #ifndef PATHWAY_PATH_H
 #define PATHWAY_PATH_H
 
+#include <cstddef>
+
 #include <stdint.h>
 
 // The following structures declare the minimum we need + a marker (generationId) to
@@ -26,13 +28,13 @@
 // still exist but was moved after the data we need.
 
 enum class Verb : uint8_t {
-    Move,
-    Line,
-    Quadratic,
-    Conic,
-    Cubic,
-    Close,
-    Done
+    Move      = 0,
+    Line      = 1,
+    Quadratic = 2,
+    Conic     = 3,
+    Cubic     = 4,
+    Close     = 5,
+    Done      = 6
 };
 
 struct Point {
@@ -115,6 +117,27 @@ struct PathRef30 {
     __unused uint32_t generationId;
 };
 
+struct PathRef34 {
+                   __unused int32_t refCount;
+                   __unused float left;
+                   __unused float top;
+                   __unused float right;
+                   __unused float bottom;
+    alignas(Point) __unused std::byte pointStorage[sizeof(Point) * 4];
+                            Point* points;
+                   __unused int pointSize;
+                   __unused uint32_t pointCapacity;
+    alignas(Verb) __unused std::byte verbStorage[sizeof(Verb) * 4];
+                            Verb* verbs;
+                            int verbSize;
+                   __unused int verbCapacity;
+    alignas(float) __unused std::byte conicStorage[sizeof(float) * 2];
+                            float* conicWeights;
+                   __unused int conicWeightsSize;
+                   __unused int conicWeightsCapacity;
+                   __unused uint32_t generationId;
+};
+
 struct Path {
     PathRef21* pathRef;
 };
diff --git a/pathway/src/main/cpp/pathway.cpp b/pathway/src/main/cpp/pathway.cpp
index 39d68f9..ec1a127 100644
--- a/pathway/src/main/cpp/pathway.cpp
+++ b/pathway/src/main/cpp/pathway.cpp
@@ -40,14 +40,20 @@ std::once_flag sApiLevelOnceFlag;
 
 static uint32_t api_level() {
     std::call_once(sApiLevelOnceFlag, []() {
-        char sdkVersion[PROP_VALUE_MAX];
-        __system_property_get("ro.build.version.sdk", sdkVersion);
-        sApiLevel = atoi(sdkVersion); // NOLINT(cert-err34-c)
+        char buffer[PROP_VALUE_MAX];
+        __system_property_get("ro.build.version.sdk", buffer);
+        sApiLevel = atoi(buffer); // NOLINT(cert-err34-c)
+
+        // Adapt API level for Developer Preview builds
+        __system_property_get("ro.build.version.release_or_codename", buffer);
+        if (sApiLevel < 34 && !strcmp(buffer, "UpsideDownCake")) {
+            sApiLevel = 34;
+        }
     });
     return sApiLevel;
 }
 
-static jlong createPathIterator(JNIEnv* env, jobject,
+static jlong createPathIterator(JNIEnv* env, jclass,
         jobject path_, jint conicEvaluation_, jfloat tolerance_) {
 
     auto nativePath = static_cast<intptr_t>(env->GetLongField(path_, sPath.nativePath));
@@ -60,7 +66,14 @@ static jlong createPathIterator(JNIEnv* env, jobject,
     PathIterator::VerbDirection direction;
 
     const uint32_t apiLevel = api_level();
-    if (apiLevel >= 30) {
+    if (apiLevel >= 33) {
+        auto* ref = reinterpret_cast<PathRef34*>(path->pathRef);
+        points = ref->points;
+        verbs = ref->verbs;
+        conicWeights = ref->conicWeights;
+        count = ref->verbSize;
+        direction = PathIterator::VerbDirection::Forward;
+    } else if (apiLevel >= 30) {
         auto* ref = reinterpret_cast<PathRef30*>(path->pathRef);
         points = ref->points;
         verbs = ref->verbs;