Merge pull request #122 from cryptimeleon/develop

v2.1.0 Release
cryptimeleon · Jul 5, 2021 · 2250b1a · 2250b1a
2 parents bb8c000 + 3603947
commit 2250b1a
Show file tree

Hide file tree

Showing 17 changed files with 271 additions and 179 deletions.
diff --git a/.github/workflows/android.yaml b/.github/workflows/android.yaml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.1.0]
+
+### Added
+- Algorithm selection for debug groups
+
+### Fixed
+- `IntegerRing.decomposeIntoDigits` sometimes worked incorrectly
+
+## [2.0.0] - 2021-06-23
+
 ### Added
 - Additional operator overload methods added to `ExponentExpr`
 - `BasicBilinearGroup` wrappers for the implemented bilinear groups
@@ -32,6 +42,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Initial release
 
 
-[Unreleased]: https://github.com/cryptimeleon/math/compare/v1.0.0...HEAD
+[Unreleased]: https://github.com/cryptimeleon/math/compare/v2.1.0...HEAD
+[2.1.0]: https://github.com/cryptimeleon/math/compare/v2.0.0...v2.1.0
+[2.0.0]: https://github.com/cryptimeleon/math/compare/v1.0.0...v2.0.0
 [1.0.0]: https://github.com/cryptimeleon/math/releases/tag/v1.0.0
-
diff --git a/DEVELOPER.md b/DEVELOPER.md
diff --git a/README.md b/README.md
@@ -1,7 +1,6 @@
 ![Build Status](https://github.com/cryptimeleon/math/workflows/Development%20Java%20CI/badge.svg)
 ![Build Status](https://github.com/cryptimeleon/math/workflows/Main%20Java%20CI/badge.svg)
 ![Build Status](https://github.com/cryptimeleon/math/workflows/Scheduled%20Main%20Java%20CI/badge.svg)
-![Build Status](https://github.com/cryptimeleon/math/workflows/Android%20CI/badge.svg)
 ## Math
 
 The Cryptimeleon Math library provides the mathematical foundation for the other Cryptimeleon libraries.
@@ -68,15 +67,15 @@ To add the newest Math version as a dependency, add this to your project's POM:
 <dependency>
     <groupId>org.cryptimeleon</groupId>
     <artifactId>math</artifactId>
-    <version>1.0.0</version>
+    <version>2.1.0</version>
 </dependency>
 ```
 
 ### Installation With Gradle
 
 Math is published via Maven Central.
 Therefore, you need to add `mavenCentral()` to the `repositories` section of your project's `build.gradle` file.
-Then, add `implementation group: 'org.cryptimeleon', name: 'math', version: '1.0.0'` to the `dependencies` section of your `build.gradle` file.
+Then, add `implementation group: 'org.cryptimeleon', name: 'math', version: '2.1.0'` to the `dependencies` section of your `build.gradle` file.
 
 For example:
 
@@ -86,7 +85,7 @@ repositories {
 }
 
 dependencies {
-    implementation group: 'org.cryptimeleon', name: 'math', version: '1.0.0'
+    implementation group: 'org.cryptimeleon', name: 'math', version: '2.1.0'
 }
 ```
 

diff --git a/android-test/build.gradle b/android-test/build.gradle
diff --git a/android-test/src/main/AndroidManifest.xml b/android-test/src/main/AndroidManifest.xml
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ plugins {
 group = 'org.cryptimeleon'
 archivesBaseName = project.name
 boolean isRelease = project.hasProperty("release")
-version = '2.0.0'  + (isRelease ? "" : "-SNAPSHOT")
+version = '2.1.0'  + (isRelease ? "" : "-SNAPSHOT")
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8

diff --git a/settings.gradle b/settings.gradle
@@ -1,3 +1 @@
 rootProject.name = 'math'
-
-include 'android-test'
diff --git a/src/main/java/org/cryptimeleon/math/structures/cartesian/GroupElementExpressionVector.java b/src/main/java/org/cryptimeleon/math/structures/cartesian/GroupElementExpressionVector.java
@@ -83,6 +83,8 @@ protected static GroupElementExpression exponentiateWithObject(GroupElementExpre
             return g.pow((Long) exp);
         if (exp instanceof ExponentExpr)
             return g.pow((ExponentExpr) exp);
+        if (exp instanceof String)
+            return g.pow((String) exp);
         throw new IllegalArgumentException("Cannot compute g^"+exp.getClass().getName());
     }