Merge branch 'freemarker-update'

greenrobot · Feb 18, 2020 · 42de115 · 42de115
2 parents 85ff983 + 0d67e3d
commit 42de115
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/DaoGenerator/build.gradle b/DaoGenerator/build.gradle
@@ -10,8 +10,8 @@ repositories {
 }
 
 dependencies {
-    compile 'org.freemarker:freemarker:2.3.23'
-    testCompile 'junit:junit:4.12'
+    compile 'org.freemarker:freemarker:2.3.29'
+    testImplementation 'junit:junit:4.12'
 }
 
 sourceSets {

diff --git a/DaoGenerator/src/org/greenrobot/greendao/generator/DaoGenerator.java b/DaoGenerator/src/org/greenrobot/greendao/generator/DaoGenerator.java
@@ -69,7 +69,7 @@ public DaoGenerator() throws IOException {
     }
 
     private Configuration getConfiguration(String probingTemplate) throws IOException {
-        Configuration config = new Configuration(Configuration.VERSION_2_3_23);
+        Configuration config = new Configuration(Configuration.VERSION_2_3_29);
         config.setClassForTemplateLoading(getClass(), "/");
 
         try {