diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 5ca13c5..cf0fdd6 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,6 +1,5 @@ import java.util.Date import java.text.SimpleDateFormat - plugins { id("com.android.application") id("org.jetbrains.kotlin.android") @@ -17,8 +16,8 @@ android { applicationId = "com.key.coolkeyboard" minSdk = 23 targetSdk = 34 - versionCode = 4 - versionName = "1.0.3" + versionCode = 5 + versionName = "1.0.4" setProperty( "archivesBaseName", "coolkeyboard_v" + versionName + "(${versionCode})_$timestamp" @@ -75,58 +74,90 @@ dependencies { implementation("com.google.firebase:firebase-crashlytics-ktx") implementation("com.google.firebase:firebase-config") - //-----------------------------------------------TopOn(pangle、IronSource、mintegral、unityads、liftoff(vungle)、Bigo) + //-----------------------------------------------TopOn(Mintegral、Pangle、UnitAds、Digital Turbine(Fyber)、Chartboost&Helium、Ironsource、Liftoff(Vungle)、Inmobi、Start.io、Appnext、Bigo) + //Anythink (Necessary) - implementation("com.anythink.sdk:core-tpn:6.3.68") - implementation("com.anythink.sdk:nativead-tpn:6.3.68") - implementation("com.anythink.sdk:banner-tpn:6.3.68") - implementation("com.anythink.sdk:interstitial-tpn:6.3.68") - implementation("com.anythink.sdk:rewardedvideo-tpn:6.3.68") - implementation("com.anythink.sdk:splash-tpn:6.3.68") + implementation("com.anythink.sdk:core-tpn:6.4.07") + implementation("com.anythink.sdk:nativead-tpn:6.4.07") + implementation("com.anythink.sdk:banner-tpn:6.4.07") + implementation("com.anythink.sdk:interstitial-tpn:6.4.07") + implementation("com.anythink.sdk:rewardedvideo-tpn:6.4.07") + implementation("com.anythink.sdk:splash-tpn:6.4.07") //Androidx (Necessary) - implementation("androidx.appcompat:appcompat:1.1.0") - implementation("androidx.browser:browser:1.4.0") + implementation("androidx.appcompat:appcompat:1.1.0") + implementation("androidx.browser:browser:1.4.0") + + //StartApp + implementation("com.anythink.sdk:adapter-tpn-startapp:6.4.07") + implementation("com.startapp:inapp-sdk:5.0.2") + + //Appnext + implementation("com.anythink.sdk:adapter-tpn-appnext:6.4.07") + implementation("com.appnext.sdk:ads:2.7.1.473") + implementation("com.appnext.sdk:banners:2.7.1.473") + implementation("com.appnext.sdk:native-ads2:2.7.1.473") + implementation("com.appnext.sdk:actions:2.4.6.472") + implementation("androidx.constraintlayout:constraintlayout:2.0.4") //Vungle - implementation("com.anythink.sdk:adapter-tpn-vungle:6.3.68") - implementation("com.vungle:vungle-ads:7.3.2") - implementation("com.google.android.gms:play-services-basement:18.1.0") - implementation("com.google.android.gms:play-services-ads-identifier:18.0.1") + implementation("com.anythink.sdk:adapter-tpn-vungle:6.4.07") + implementation("com.vungle:vungle-ads:7.4.0") + implementation("com.google.android.gms:play-services-basement:18.1.0") + implementation("com.google.android.gms:play-services-ads-identifier:18.0.1") //UnityAds - implementation("com.anythink.sdk:adapter-tpn-unityads:6.3.68") - implementation("com.unity3d.ads:unity-ads:4.9.3") + implementation("com.anythink.sdk:adapter-tpn-unityads:6.4.07") + implementation("com.unity3d.ads:unity-ads:4.12.2") //Ironsource - implementation("com.anythink.sdk:adapter-tpn-ironsource:6.3.68") - implementation("com.ironsource.sdk:mediationsdk:8.1.0") - implementation("com.google.android.gms:play-services-appset:16.0.2") - implementation("com.google.android.gms:play-services-ads-identifier:18.0.1") - implementation("com.google.android.gms:play-services-basement:18.1.0") + implementation("com.anythink.sdk:adapter-tpn-ironsource:6.4.07") + implementation("com.ironsource.sdk:mediationsdk:8.2.1") + implementation("com.google.android.gms:play-services-appset:16.0.2") + implementation("com.google.android.gms:play-services-ads-identifier:18.0.1") + implementation("com.google.android.gms:play-services-basement:18.1.0") //Bigo - implementation("com.anythink.sdk:adapter-tpn-bigo:6.3.68") - implementation("com.bigossp:bigo-ads:4.7.4") + implementation("com.anythink.sdk:adapter-tpn-bigo:6.4.07") + implementation("com.bigossp:bigo-ads:4.9.0") //Pangle - implementation("com.anythink.sdk:adapter-tpn-pangle-nonchina:6.3.68.1") - implementation("com.pangle.global:ads-sdk:6.0.0.3") - implementation("com.google.android.gms:play-services-ads-identifier:18.0.1") + implementation("com.anythink.sdk:adapter-tpn-pangle-nonchina:6.4.07") + implementation("com.pangle.global:ads-sdk:6.1.0.9") + implementation("com.google.android.gms:play-services-ads-identifier:18.0.1") + + //Inmobi + implementation("com.anythink.sdk:adapter-tpn-inmobi:6.4.07") + implementation("com.inmobi.monetization:inmobi-ads-kotlin:10.7.5") //Mintegral - implementation("com.anythink.sdk:adapter-tpn-mintegral-nonchina:6.3.68") - implementation("com.mbridge.msdk.oversea:reward:16.7.51") - implementation("com.mbridge.msdk.oversea:newinterstitial:16.7.51") - implementation("com.mbridge.msdk.oversea:mbnative:16.7.51") - implementation("com.mbridge.msdk.oversea:mbnativeadvanced:16.7.51") - implementation("com.mbridge.msdk.oversea:mbsplash:16.7.51") - implementation("com.mbridge.msdk.oversea:mbbanner:16.7.51") - implementation("com.mbridge.msdk.oversea:mbbid:16.7.51") - implementation("androidx.recyclerview:recyclerview:1.1.0") + implementation("com.anythink.sdk:adapter-tpn-mintegral-nonchina:6.4.07") + implementation("com.mbridge.msdk.oversea:reward:16.8.11") + implementation("com.mbridge.msdk.oversea:newinterstitial:16.8.11") + implementation("com.mbridge.msdk.oversea:mbnative:16.8.11") + implementation("com.mbridge.msdk.oversea:mbnativeadvanced:16.8.11") + implementation("com.mbridge.msdk.oversea:mbsplash:16.8.11") + implementation("com.mbridge.msdk.oversea:mbbanner:16.8.11") + implementation("com.mbridge.msdk.oversea:mbbid:16.8.11") + implementation("androidx.recyclerview:recyclerview:1.1.0") - //Tramini -// implementation("com.anythink.sdk:tramini-plugin-tpn:6.3.68") + //Chartboost + implementation("com.anythink.sdk:adapter-tpn-chartboost:6.4.07") + implementation("com.chartboost:chartboost-sdk:9.7.0") + implementation("com.chartboost:chartboost-mediation-sdk:4.9.1") + implementation("com.chartboost:chartboost-mediation-adapter-chartboost:4.9.7.0.0") + implementation("com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0") + implementation("com.squareup.okhttp3:logging-interceptor:4.10.0") + implementation("com.squareup.okhttp3:okhttp:4.10.0") + implementation("com.squareup.retrofit2:converter-scalars:2.9.0") + implementation("com.squareup.retrofit2:retrofit:2.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1") + + //Fyber + implementation("com.anythink.sdk:adapter-tpn-fyber:6.4.07") + implementation("com.fyber:marketplace-sdk:8.3.0") + implementation("com.google.android.gms:play-services-ads-identifier:18.0.1") // Debugger UI Tools // implementation ("com.anythink.sdk:debugger-ui:1.0.7") diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 529a938..9fab68b 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -36,12 +36,28 @@ #---------------------------------------------Topon + -keep class com.startapp.** { + *; + } + + -keep class com.truenet.** { + *; + } + + -keepattributes Exceptions, InnerClasses, Signature, Deprecated, SourceFile, + LineNumberTable, *Annotation*, EnclosingMethod + -dontwarn android.webkit.JavascriptInterface + -dontwarn com.startapp.** + + -dontwarn org.jetbrains.annotations.** + -keep class com.appnext.** { *; } + -dontwarn com.appnext.** # Vungle -dontwarn com.vungle.ads.** -keepclassmembers class com.vungle.ads.** { *; } - + -keep class com.vungle.ads.** @@ -106,6 +122,25 @@ @android.webkit.JavascriptInterface ; } -keep class com.bytedance.sdk.** { *; } + -keep class com.inmobi.** { *; } + -keep public class com.google.android.gms.** + -dontwarn com.google.android.gms.** + -dontwarn com.squareup.picasso.** + -keep class com.google.android.gms.ads.identifier.AdvertisingIdClient{ + public *; + } + -keep class com.google.android.gms.ads.identifier.AdvertisingIdClient$Info{ + public *; + } + # skip the Picasso library classes + -keep class com.squareup.picasso.** {*;} + -dontwarn com.squareup.okhttp.** + # skip Moat classes + -keep class com.moat.** {*;} + -dontwarn com.moat.** + # skip IAB classes + -keep class com.iab.** {*;} + -dontwarn com.iab.** -keepattributes Signature -keepattributes *Annotation* -keep class com.mbridge.** {*; } @@ -125,5 +160,7 @@ -keep public class androidx.core.app.NotificationCompat{ *; } -keep public class androidx.appcompat.widget.AppCompatImageView { *; } -keep public class androidx.recyclerview.*{ *; } + -keep class com.chartboost.** { *; } + #---------------------------------------------Topon diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index d004d1d..6282856 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -11,9 +11,9 @@ "type": "SINGLE", "filters": [], "attributes": [], - "versionCode": 4, - "versionName": "1.0.3", - "outputFile": "coolkeyboard_v1.0.3(4)_08_26_18_33-release.apk" + "versionCode": 5, + "versionName": "1.0.4", + "outputFile": "coolkeyboard_v1.0.4(5)_09_13_12_46-release.apk" } ], "elementType": "File" diff --git a/app/src/main/java/com/key/coolkeyboard/CoolKeyboardSkin.java b/app/src/main/java/com/key/coolkeyboard/CoolKeyboardSkin.java index f34e713..4ed614d 100644 --- a/app/src/main/java/com/key/coolkeyboard/CoolKeyboardSkin.java +++ b/app/src/main/java/com/key/coolkeyboard/CoolKeyboardSkin.java @@ -163,10 +163,6 @@ public class CoolKeyboardSkin extends Application { // ATDebuggerUITest.showDebuggerUI(context,TOP_DEBUG); } - public static List lodAd() { - - return null; - } private void initData() { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 06b0bd7..8d5ad98 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -32,7 +32,7 @@ Step 2:Enabled For normal use, please enter the setting to complete the setting steps. Start using Wallpaper Keyboard ! - Version 1.0.3 + Version 1.0.4 Hello blank fragment https://sites.google.com/view/cool-keyboard---theme-skin diff --git a/gradle.properties b/gradle.properties index 3e927b1..d703cac 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ # http://www.gradle.org/docs/current/userguide/build_environment.html # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +org.gradle.jvmargs=-Xmx4096m -Dfile.encoding=UTF-8 # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects diff --git a/settings.gradle.kts b/settings.gradle.kts index 62c1da6..48d69ff 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -11,14 +11,37 @@ dependencyResolutionManagement { google() mavenCentral() maven("https://jitpack.io") +// //Anythink(Core) +// maven("https://jfrog.anythinktech.com/artifactory/overseas_sdk") +// //Ironsource +// maven("https://android-sdk.is.com/") +// //Mintegral +// maven("https://dl-maven-android.mintegral.com/repository/mbridge_android_sdk_oversea") +// //Pangle +// maven ( "https://artifact.bytedance.com/repository/pangle") + + //Anythink(Core) - maven("https://jfrog.anythinktech.com/artifactory/overseas_sdk") + maven ("https://jfrog.anythinktech.com/artifactory/overseas_sdk") + + + //Appnext + maven ("https://dl.appnext.com") + + //Ironsource - maven("https://android-sdk.is.com/") - //Mintegral - maven("https://dl-maven-android.mintegral.com/repository/mbridge_android_sdk_oversea") + maven ("https://android-sdk.is.com/") + //Pangle - maven ( "https://artifact.bytedance.com/repository/pangle") + maven ("https://artifact.bytedance.com/repository/pangle") + + //Mintegral + maven ("https://dl-maven-android.mintegral.com/repository/mbridge_android_sdk_oversea") + + + //Chartboost + maven ("https://cboost.jfrog.io/artifactory/chartboost-ads") + maven ("https://cboost.jfrog.io/artifactory/chartboost-mediation") //TopOn集成测试工具 // maven ( "https://jfrog.anythinktech.com/artifactory/debugger") @@ -27,4 +50,4 @@ dependencyResolutionManagement { rootProject.name = "Cool Keyboard" include(":app") - \ No newline at end of file +