From 2453d5a751fb9a314b5bbe628e927a5faa97c92f Mon Sep 17 00:00:00 2001
From: Alice Jacka <alice@jacka.net.au>
Date: Mon, 6 Jun 2022 16:17:22 +1000
Subject: [PATCH 1/3] Download ant-javacard instead of building

---
 .gitmodules      |  6 +-----
 build.xml        | 12 +++++++-----
 ext/ant-javacard |  1 -
 3 files changed, 8 insertions(+), 11 deletions(-)
 delete mode 160000 ext/ant-javacard

diff --git a/.gitmodules b/.gitmodules
index 69cb0ed..abfe843 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,10 +1,6 @@
-[submodule "ext/ant-javacard"]
-	path = ext/ant-javacard
-	url = https://github.com/promovicz/ant-javacard.git
-	branch = master
 [submodule "ext/javacard-sdks"]
 	path = ext/javacard-sdks
 	url = https://github.com/martinpaljak/oracle_javacard_sdks.git
 [submodule "ext/globalplatform-exports"]
 	path = ext/globalplatform-exports
-	url = https://github.com/OpenJavaCard/globalplatform-exports.git
+	url = https://github.com/OpenJavaCard/globalplatform-exports.git
\ No newline at end of file
diff --git a/build.xml b/build.xml
index 5e8cae1..816ed47 100644
--- a/build.xml
+++ b/build.xml
@@ -13,20 +13,22 @@
     <!-- Cleanup target -->
     <target name="clean" description="Delete build output">
         <delete dir="build"/>
+        <delete dir="ext/ant-javacard"/>
     </target>
 
     <!-- Prepare build tools and directories -->
     <target name="prepare" description="Prepare build">
-        <ant dir="ext/ant-javacard"/>
-        <taskdef name="javacard"
-                 classpath="${ext.ant-javacard}/ant-javacard.jar"
-                 classname="pro.javacard.ant.JavaCard"/>
-
         <mkdir dir="build/javacard"/>
         <mkdir dir="build/classes/advanced"/>
         <mkdir dir="build/classes/full"/>
         <mkdir dir="build/classes/stub"/>
         <mkdir dir="build/classes/tiny"/>
+        <mkdir dir="ext/ant-javacard"/>
+
+        <get src="https://github.com/martinpaljak/ant-javacard/releases/latest/download/ant-javacard.jar" dest="ext/ant-javacard/ant-javacard.jar" skipexisting="true"/>
+        <taskdef name="javacard"
+                 classpath="${ext.ant-javacard}/ant-javacard.jar"
+                 classname="pro.javacard.ant.JavaCard"/>
     </target>
 
     <!-- Build-all target -->
diff --git a/ext/ant-javacard b/ext/ant-javacard
deleted file mode 160000
index 769c722..0000000
--- a/ext/ant-javacard
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 769c7223a9d7f93c347de01d1caf1e66ee4ca3d4

From 33638fec2f7b84e93b09a41fba82090f74bbc271 Mon Sep 17 00:00:00 2001
From: Alice Jacka <alice@jacka.net.au>
Date: Mon, 6 Jun 2022 16:24:52 +1000
Subject: [PATCH 2/3] update jc-sdk to 3.1

---
 build.xml         | 10 +++++-----
 ext/javacard-sdks |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build.xml b/build.xml
index 816ed47..cbb6e08 100644
--- a/build.xml
+++ b/build.xml
@@ -8,7 +8,7 @@
     <property name="ext.ant-javacard" value="ext/ant-javacard"/>
 
     <property name="sdk.globalplatform" value="ext/globalplatform-exports"/>
-    <property name="sdk.jc222" value="ext/javacard-sdks/jc222_kit"/>
+    <property name="sdk.jc" value="ext/javacard-sdks/jc310r20210706_kit"/>
 
     <!-- Cleanup target -->
     <target name="clean" description="Delete build output">
@@ -53,7 +53,7 @@
     </target>
 
     <target name="build-advanced">
-        <javacard jckit="${sdk.jc222}">
+        <javacard jckit="${sdk.jc}">
             <cap output="build/javacard/openjavacard-ndef-advanced.cap"
                  jar="build/javacard/openjavacard-ndef-advanced.jar"
                  classes="build/classes/advanced"
@@ -69,7 +69,7 @@
     </target>
 
     <target name="build-full">
-        <javacard jckit="${sdk.jc222}">
+        <javacard jckit="${sdk.jc}">
             <cap output="build/javacard/openjavacard-ndef-full.cap"
                  jar="build/javacard/openjavacard-ndef-full.jar"
                  classes="build/classes/full"
@@ -83,7 +83,7 @@
     </target>
 
     <target name="build-tiny">
-        <javacard jckit="${sdk.jc222}">
+        <javacard jckit="${sdk.jc}">
             <cap output="build/javacard/openjavacard-ndef-tiny.cap"
                  jar="build/javacard/openjavacard-ndef-tiny.jar"
                  classes="build/classes/tiny"
@@ -97,7 +97,7 @@
     </target>
 
     <target name="build-stub">
-        <javacard jckit="${sdk.jc222}">
+        <javacard jckit="${sdk.jc}">
             <cap output="build/javacard/openjavacard-ndef-stub.cap"
                  jar="build/javacard/openjavacard-ndef-stub.jar"
                  classes="build/classes/stub"
diff --git a/ext/javacard-sdks b/ext/javacard-sdks
index 4a69670..e305a1a 160000
--- a/ext/javacard-sdks
+++ b/ext/javacard-sdks
@@ -1 +1 @@
-Subproject commit 4a696701af819af40a3678a3734d8e704a09f4b9
+Subproject commit e305a1a0b9bf6b9a8b0c91a9aad8d73537e7ff1b

From 6bf5f632c97d47dabe657a3e32fdf18bab4c1ae4 Mon Sep 17 00:00:00 2001
From: Alice Jacka <alice@jacka.net.au>
Date: Mon, 6 Jun 2022 16:33:03 +1000
Subject: [PATCH 3/3] add ant-javacard.jar to .gitignore

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index b0e0314..bae8677 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 .gradle
 build/**
 */build
+
+ext/ant-javacard/