Fix file names and identifiers for CC-BY-2.0, CC-BY-3.0 + CC-BY-4.0

library-definitions/src/main/res/values/license_cc20_strings.xml → library-definitions/src/main/res/values/license_cc_2_0_strings.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources translatable="false">
-    <string name="define_license_cc20" translatable="false"></string>
-    <string name="license_cc20_licenseName" translatable="false">Creative Commons 2.0 License</string>
-    <string name="license_cc20_licenseWebsite" translatable="false">http://creativecommons.org/licenses/by/2.0/legalcode</string>
-    <string name="license_cc20_licenseShortDescription" translatable="false">
+    <string name="define_license_cc_2_0" translatable="false"></string>
+    <string name="license_cc_2_0_licenseName" translatable="false">Creative Commons 2.0 License</string>
+    <string name="license_cc_2_0_licenseWebsite" translatable="false">http://creativecommons.org/licenses/by/2.0/legalcode</string>
+    <string name="license_cc_2_0_licenseShortDescription" translatable="false">
         <![CDATA[THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE (\"CCPL\" OR \"LICENSE\"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
 
 BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
 ]]>
     </string>
-    <string name="license_cc20_licenseDescription" translatable="false">raw:license_cc20</string>
+    <string name="license_cc_2_0_licenseDescription" translatable="false">raw:license_cc_2_0</string>
 </resources>

library-definitions/src/main/res/values/license_cc30_strings.xml → library-definitions/src/main/res/values/license_cc_3_0_strings.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources translatable="false">
-    <string name="define_license_cc30" translatable="false"></string>
-    <string name="license_cc30_licenseName" translatable="false">Creative Commons 3.0 License</string>
-    <string name="license_cc30_licenseWebsite" translatable="false">http://creativecommons.org/licenses/by/3.0/legalcode</string>
-    <string name="license_cc30_licenseShortDescription" translatable="false">
+    <string name="define_license_cc_3_0" translatable="false"></string>
+    <string name="license_cc_3_0_licenseName" translatable="false">Creative Commons 3.0 License</string>
+    <string name="license_cc_3_0_licenseWebsite" translatable="false">http://creativecommons.org/licenses/by/3.0/legalcode</string>
+    <string name="license_cc_3_0_licenseShortDescription" translatable="false">
         <![CDATA[THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE (\"CCPL\" OR \"LICENSE\"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.<br/><br/>
 
 BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
 ]]>
     </string>
-    <string name="license_cc30_licenseDescription" translatable="false">raw:license_cc30</string>
+    <string name="license_cc_3_0_licenseDescription" translatable="false">raw:license_cc_3_0</string>
 </resources>

library-definitions/src/main/res/values/license_cc40_strings.xml → library-definitions/src/main/res/values/license_cc_4_0_strings.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources translatable="false">
-    <string name="define_license_cc40" translatable="false"></string>
-    <string name="license_cc40_licenseName" translatable="false">Creative Commons 4.0 License</string>
-    <string name="license_cc40_licenseWebsite" translatable="false">https://creativecommons.org/licenses/by/4.0/legalcode</string>
-    <string name="license_cc40_licenseShortDescription" translatable="false">
+    <string name="define_license_cc_4_0" translatable="false"></string>
+    <string name="license_cc_4_0_licenseName" translatable="false">Creative Commons 4.0 License</string>
+    <string name="license_cc_4_0_licenseWebsite" translatable="false">https://creativecommons.org/licenses/by/4.0/legalcode</string>
+    <string name="license_cc_4_0_licenseShortDescription" translatable="false">
         <![CDATA[
         By exercising the Licensed Rights (defined below), You accept
         and agree to be bound by the terms and conditions of this
@@ -16,5 +16,5 @@
         available under these terms and conditions.
 		]]>
     </string>
-    <string name="license_cc40_licenseDescription" translatable="false">raw:license_cc40</string>
+    <string name="license_cc_4_0_licenseDescription" translatable="false">raw:license_cc_4_0</string>
 </resources>

plugin-build/plugin/src/main/kotlin/com/mikepenz/aboutlibraries/plugin/mapping/License.kt

@@ -67,10 +67,10 @@ enum class License(val fullName: String, val id: String, val aboutLibsId: String
     Caldera("Caldera License", "Caldera"),
     CATOSL_1_1("Computer Associates Trusted Open Source License 1.1", "CATOSL-1.1"),
     CC_BY_1_0("Creative Commons Attribution 1.0 Generic", "CC-BY-1.0"),
-    CC_BY_2_0("Creative Commons Attribution 2.0 Generic", "CC-BY-2.0"),
+    CC_BY_2_0("Creative Commons Attribution 2.0 Generic", "CC-BY-2.0", "cc_2_0"),
     CC_BY_2_5("Creative Commons Attribution 2.5 Generic", "CC-BY-2.5"),
-    CC_BY_3_0("Creative Commons Attribution 3.0 Unported", "CC-BY-3.0"),
-    CC_BY_4_0("Creative Commons Attribution 4.0 International", "CC-BY-4.0"),
+    CC_BY_3_0("Creative Commons Attribution 3.0 Unported", "CC-BY-3.0", "cc_3_0"),
+    CC_BY_4_0("Creative Commons Attribution 4.0 International", "CC-BY-4.0", "cc_4_0"),
     CC_BY_NC_1_0("Creative Commons Attribution Non Commercial 1.0 Generic", "CC-BY-NC-1.0"),
     CC_BY_NC_2_0("Creative Commons Attribution Non Commercial 2.0 Generic", "CC-BY-NC-2.0"),
     CC_BY_NC_2_5("Creative Commons Attribution Non Commercial 2.5 Generic", "CC-BY-NC-2.5"),