diff --git a/README.md b/README.md index d7f4889..bf2cc20 100644 --- a/README.md +++ b/README.md @@ -151,7 +151,7 @@ Then try running JVM with `-noverify` option. In the IntelliJ Idea this can be configured in the top tool bar with run configurations combo box -> click -> Edit Configurations -> VM Options. -However, the `com.klinec:jcardsim:3.0.5.8` should not need the `-noverify`. +However, the `com.klinec:jcardsim:3.0.5.9` should not need the `-noverify`. ## Roadmap diff --git a/applet/build.gradle b/applet/build.gradle index ef9b36c..047a781 100644 --- a/applet/build.gradle +++ b/applet/build.gradle @@ -6,9 +6,10 @@ version '1.0-SNAPSHOT' buildscript { repositories { mavenCentral() + // mavenLocal() } dependencies { - classpath 'com.klinec:gradle-javacard:1.6.8' + classpath 'com.klinec:gradle-javacard:1.6.9' } } @@ -38,20 +39,20 @@ repositories { // Dependencies for your project dependencies { - testCompile 'org.testng:testng:6.1.1' - testCompile 'org.slf4j:slf4j-api:1.7.2' - testCompile 'org.slf4j:slf4j-log4j12:1.7.2' - testCompile 'org.apache.logging.log4j:log4j-core:2.11.2' - testCompile 'junit:junit:4.12' - testCompile 'org.junit.jupiter:junit-jupiter-api:5.1.1' - testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.1.1' - - jcardsim 'com.klinec:jcardsim:3.0.5.8' + testImplementation 'org.testng:testng:6.1.1' + testImplementation 'org.slf4j:slf4j-api:1.7.2' + testImplementation 'org.slf4j:slf4j-log4j12:1.7.2' + testImplementation 'org.apache.logging.log4j:log4j-core:2.11.2' + testImplementation 'junit:junit:4.12' + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.1.1' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.1.1' + + jcardsim 'com.klinec:jcardsim:3.0.5.9' // Include plugin as it has bundled GP & other tools. // Alternative: include GP manually, but the included // version has to be compatible with the plugin. - runtimeOnly 'com.klinec:gradle-javacard:1.6.8' + runtimeOnly 'com.klinec:gradle-javacard:1.6.9' } test { @@ -80,6 +81,8 @@ final def JC303 = libsSdk + '/jc303_kit' final def JC304 = libsSdk + '/jc304_kit' final def JC305 = libsSdk + '/jc305u1_kit' final def JC305u2 = libsSdk + '/jc305u2_kit' +final def JC305u3 = libsSdk + '/jc305u3_kit' +final def JC310b43 = libsSdk + '/jc310b43_kit' // Which JavaCard SDK to use - select // In order to compile JC222 and lower you have to have Java SDK <= 1.8 @@ -103,6 +106,7 @@ javacard { version '0.1' aid '01:02:03:04:05:06:07:08:09' output 'applet.cap' + // javaversion '1.7' //noinspection GroovyAssignabilityCheck applet { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9b94fc0..cb92f69 100644 --- 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-5.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip diff --git a/libs-sdks b/libs-sdks index 4a69670..282c7f5 160000 --- a/libs-sdks +++ b/libs-sdks @@ -1 +1 @@ -Subproject commit 4a696701af819af40a3678a3734d8e704a09f4b9 +Subproject commit 282c7f510d704045ad12c8a6525287e7ab7b82d5