diff --git a/.github/ci-gradle.properties b/.github/ci-gradle.properties index 051ca22d..f281cf92 100644 --- a/.github/ci-gradle.properties +++ b/.github/ci-gradle.properties @@ -2,7 +2,7 @@ org.gradle.daemon=true org.gradle.parallel=true org.gradle.workers.max=2 org.gradle.jvmargs=-Xmx6G -kotlin.daemon.jvmargs=-Xmx4G +kotlin.daemon.jvmargs=-Xmx6G org.gradle.caching=true org.gradle.configureondemand=true # parallel kapt diff --git a/google-material-typeface/google-material-typeface-outlined-library/build.gradle b/google-material-typeface/google-material-typeface-outlined-library/build.gradle index c7d54bcc..d8575410 100644 --- a/google-material-typeface/google-material-typeface-outlined-library/build.gradle +++ b/google-material-typeface/google-material-typeface-outlined-library/build.gradle @@ -22,7 +22,7 @@ android { compileSdkVersion setup.compileSdk buildToolsVersion setup.buildTools - namespace = "com.mikepenz.iconics.typeface.library.googlematerial" + namespace = "com.mikepenz.iconics.typeface.library.googlematerial.outlined" defaultConfig { minSdkVersion setup.minSdk targetSdkVersion setup.targetSdk diff --git a/google-material-typeface/google-material-typeface-outlined-library/src/main/java/com/mikepenz/iconics/typeface/library/googlematerial/OutlinedGoogleMaterial.kt b/google-material-typeface/google-material-typeface-outlined-library/src/main/java/com/mikepenz/iconics/typeface/library/googlematerial/OutlinedGoogleMaterial.kt index ac0cc677..dd6d2e9e 100644 --- a/google-material-typeface/google-material-typeface-outlined-library/src/main/java/com/mikepenz/iconics/typeface/library/googlematerial/OutlinedGoogleMaterial.kt +++ b/google-material-typeface/google-material-typeface-outlined-library/src/main/java/com/mikepenz/iconics/typeface/library/googlematerial/OutlinedGoogleMaterial.kt @@ -17,6 +17,7 @@ package com.mikepenz.iconics.typeface.library.googlematerial import com.mikepenz.iconics.typeface.IIcon import com.mikepenz.iconics.typeface.ITypeface +import com.mikepenz.iconics.typeface.library.googlematerial.outlined.R import java.util.LinkedList @Suppress("EnumEntryName") diff --git a/google-material-typeface/google-material-typeface-rounded-library/build.gradle b/google-material-typeface/google-material-typeface-rounded-library/build.gradle index 58f9985c..187c5971 100644 --- a/google-material-typeface/google-material-typeface-rounded-library/build.gradle +++ b/google-material-typeface/google-material-typeface-rounded-library/build.gradle @@ -21,7 +21,7 @@ apply from: "../../gradle/compile.groovy" android { compileSdkVersion setup.compileSdk buildToolsVersion setup.buildTools - namespace = "com.mikepenz.iconics.typeface.library.googlematerial" + namespace = "com.mikepenz.iconics.typeface.library.googlematerial.rounded" defaultConfig { minSdkVersion setup.minSdk diff --git a/google-material-typeface/google-material-typeface-rounded-library/src/main/java/com/mikepenz/iconics/typeface/library/googlematerial/RoundedGoogleMaterial.kt b/google-material-typeface/google-material-typeface-rounded-library/src/main/java/com/mikepenz/iconics/typeface/library/googlematerial/RoundedGoogleMaterial.kt index a50076c7..984ef43b 100644 --- a/google-material-typeface/google-material-typeface-rounded-library/src/main/java/com/mikepenz/iconics/typeface/library/googlematerial/RoundedGoogleMaterial.kt +++ b/google-material-typeface/google-material-typeface-rounded-library/src/main/java/com/mikepenz/iconics/typeface/library/googlematerial/RoundedGoogleMaterial.kt @@ -17,6 +17,7 @@ package com.mikepenz.iconics.typeface.library.googlematerial import com.mikepenz.iconics.typeface.IIcon import com.mikepenz.iconics.typeface.ITypeface +import com.mikepenz.iconics.typeface.library.googlematerial.rounded.R import java.util.LinkedList @Suppress("EnumEntryName") diff --git a/google-material-typeface/google-material-typeface-sharp-library/build.gradle b/google-material-typeface/google-material-typeface-sharp-library/build.gradle index 58f9985c..fa603c72 100644 --- a/google-material-typeface/google-material-typeface-sharp-library/build.gradle +++ b/google-material-typeface/google-material-typeface-sharp-library/build.gradle @@ -21,7 +21,7 @@ apply from: "../../gradle/compile.groovy" android { compileSdkVersion setup.compileSdk buildToolsVersion setup.buildTools - namespace = "com.mikepenz.iconics.typeface.library.googlematerial" + namespace = "com.mikepenz.iconics.typeface.library.googlematerial.sharp" defaultConfig { minSdkVersion setup.minSdk diff --git a/google-material-typeface/google-material-typeface-sharp-library/src/main/java/com/mikepenz/iconics/typeface/library/googlematerial/SharpGoogleMaterial.kt b/google-material-typeface/google-material-typeface-sharp-library/src/main/java/com/mikepenz/iconics/typeface/library/googlematerial/SharpGoogleMaterial.kt index f8f088ec..af2b0b56 100644 --- a/google-material-typeface/google-material-typeface-sharp-library/src/main/java/com/mikepenz/iconics/typeface/library/googlematerial/SharpGoogleMaterial.kt +++ b/google-material-typeface/google-material-typeface-sharp-library/src/main/java/com/mikepenz/iconics/typeface/library/googlematerial/SharpGoogleMaterial.kt @@ -17,6 +17,7 @@ package com.mikepenz.iconics.typeface.library.googlematerial import com.mikepenz.iconics.typeface.IIcon import com.mikepenz.iconics.typeface.ITypeface +import com.mikepenz.iconics.typeface.library.googlematerial.sharp.R import java.util.LinkedList @Suppress("EnumEntryName")