Update 3.2.0

cleveradssolutions · Jul 20, 2023 · 9f7f3da · 9f7f3da
1 parent 0cab8ac
commit 9f7f3da
Show file tree

Hide file tree

Showing 14 changed files with 44 additions and 31 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,14 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.cas_version = '3.1.6'
-    ext.kotlin_version = '1.7.22'
+    ext.cas_version = '3.2.0'
+    ext.kotlin_version = '1.8.20'
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.2'
+        classpath 'com.android.tools.build:gradle:7.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Feb 22 09:38:57 EET 2022
+#Fri Jun 23 16:23:15 EEST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/javaSample/build.gradle b/javaSample/build.gradle
@@ -3,10 +3,10 @@ apply plugin: 'com.android.application'
 android {
     compileSdkVersion 33
     buildToolsVersion '33.0.1'
-    namespace 'com.cleversolutions.ads.android.sampleapp'
+    namespace 'com.cleveradssolutions.sampleapp'
 
     defaultConfig {
-        applicationId "com.cleversolutions.ads.android.sampleapp"
+        applicationId "com.cleveradssolutions.sampleapp"
         minSdkVersion 21
         targetSdkVersion 33
         versionCode 1

diff --git a/javaSample/src/main/AndroidManifest.xml b/javaSample/src/main/AndroidManifest.xml
@@ -7,13 +7,13 @@
     <uses-permission android:name="android.permission.VIBRATE" />
 
     <application
-        android:name=".SampleApplication"
+        android:name="com.cleveradssolutions.sampleapp.SampleApplication"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         android:networkSecurityConfig="@xml/network_security_config">
-        <activity android:name=".SampleAppOpenAd"
+        <activity android:name="com.cleveradssolutions.sampleapp.SampleAppOpenAd"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="locked"
             android:exported="true">
@@ -24,7 +24,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".SampleActivity"
+            android:name="com.cleveradssolutions.sampleapp.SampleActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="fullSensor" />
 

diff --git a/...ads/android/sampleapp/SampleActivity.java → ...dssolutions/sampleapp/SampleActivity.java b/...ads/android/sampleapp/SampleActivity.java → ...dssolutions/sampleapp/SampleActivity.java
@@ -1,4 +1,4 @@
-package com.cleversolutions.ads.android.sampleapp;
+package com.cleveradssolutions.sampleapp;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -22,6 +22,7 @@
 import com.cleversolutions.ads.MediationManager;
 import com.cleversolutions.ads.android.CAS;
 import com.cleversolutions.ads.android.CASBannerView;
+import com.cleveradssolutions.sampleapp.R;
 
 import java.util.Objects;
 
@@ -159,7 +160,7 @@ public void onClosed() {
         };
 
         // Any loading mode, except manual,
-        // automatically controls the preparation of ads for impressions.
+        // automatically controls the preparation of sdk for impressions.
         if (CAS.settings.getLoadingMode() == LoadingManagerMode.Manual) {
             findViewById(R.id.loadInterBtn).setOnClickListener(v -> {
                 label.setText("Loading");
@@ -237,7 +238,7 @@ public void onClosed() {
         };
 
         // Any loading mode, except manual,
-        // automatically controls the preparation of ads for impressions.
+        // automatically controls the preparation of sdk for impressions.
         if (CAS.settings.getLoadingMode() == LoadingManagerMode.Manual) {
             findViewById(R.id.loadRewardedBtn).setOnClickListener(v -> {
                 label.setText("Loading");

diff --git a/...ds/android/sampleapp/SampleAppOpenAd.java → ...ssolutions/sampleapp/SampleAppOpenAd.java b/...ds/android/sampleapp/SampleAppOpenAd.java → ...ssolutions/sampleapp/SampleAppOpenAd.java
@@ -1,4 +1,4 @@
-package com.cleversolutions.ads.android.sampleapp;
+package com.cleveradssolutions.sampleapp;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -18,6 +18,7 @@
 import com.cleversolutions.ads.LoadAdCallback;
 import com.cleversolutions.ads.MediationManager;
 import com.cleversolutions.ads.android.CAS;
+import com.cleveradssolutions.sampleapp.R;
 
 import org.jetbrains.annotations.NotNull;
 

diff --git a/.../android/sampleapp/SampleApplication.java → ...olutions/sampleapp/SampleApplication.java b/.../android/sampleapp/SampleApplication.java → ...olutions/sampleapp/SampleApplication.java
@@ -1,4 +1,4 @@
-package com.cleversolutions.ads.android.sampleapp;
+package com.cleveradssolutions.sampleapp;
 
 import android.app.Application;
 import android.util.Log;

diff --git a/javaSample/src/main/res/layout/activity_main.xml b/javaSample/src/main/res/layout/activity_main.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/colorPrimary"
-    tools:context=".SampleActivity">
+    tools:context="com.cleveradssolutions.sampleapp.SampleActivity">
 
     <LinearLayout
         android:id="@+id/container"

diff --git a/kotlinSample/build.gradle b/kotlinSample/build.gradle
@@ -4,21 +4,25 @@ apply plugin: 'kotlin-android'
 android {
     compileSdkVersion 33
     buildToolsVersion '33.0.1'
-    namespace 'com.cleversolutions.ads.android.sampleapp'
+    namespace 'com.cleveradssolutions.sampleapp'
 
     defaultConfig {
-        applicationId "com.cleversolutions.ads.android.sampleapp"
+        applicationId "com.cleveradssolutions.sampleapp"
         minSdkVersion 21
         targetSdkVersion 33
         versionCode 1
         versionName "1.0"
     }
 
     buildTypes {
-        release {
+        debug {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
+        release {
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
     }
 
     // Required version
@@ -35,4 +39,3 @@ dependencies {
 
     implementation "com.cleveradssolutions:cas-families:$cas_version"
 }
-
diff --git a/kotlinSample/src/main/AndroidManifest.xml b/kotlinSample/src/main/AndroidManifest.xml
@@ -7,14 +7,14 @@
     <uses-permission android:name="android.permission.VIBRATE" />
 
     <application
-        android:name=".SampleApplication"
+        android:name="com.cleveradssolutions.sampleapp.SampleApplication"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
-            android:name=".SampleAppOpenAdActivity"
+            android:name="com.cleveradssolutions.sampleapp.SampleAppOpenAdActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:exported="true"
             android:screenOrientation="locked">
@@ -25,7 +25,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".SampleActivity"
+            android:name="com.cleveradssolutions.sampleapp.SampleActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="fullSensor" />
 

diff --git a/...s/ads/android/sampleapp/SampleActivity.kt → ...radssolutions/sampleapp/SampleActivity.kt b/...s/ads/android/sampleapp/SampleActivity.kt → ...radssolutions/sampleapp/SampleActivity.kt
@@ -1,4 +1,4 @@
-package com.cleversolutions.ads.android.sampleapp
+package com.cleveradssolutions.sampleapp
 
 import android.app.Activity
 import android.os.Bundle
@@ -8,6 +8,7 @@ import android.widget.Button
 import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
+import com.cleveradssolutions.sdk.android.sampleapp.R
 import com.cleversolutions.ads.*
 import com.cleversolutions.ads.android.CAS
 import com.cleversolutions.ads.android.CASBannerView
@@ -127,7 +128,7 @@ class SampleActivity : Activity() {
         }
 
         // Any loading mode, except manual,
-        // automatically controls the preparation of ads for impressions.
+        // automatically controls the preparation of sdk for impressions.
         if (CAS.settings.loadingMode == LoadingManagerMode.Manual) {
             findViewById<Button>(R.id.loadInterBtn).setOnClickListener {
                 label.text = "Loading"
@@ -203,7 +204,7 @@ class SampleActivity : Activity() {
         }
 
         // Any loading mode, except manual,
-        // automatically controls the preparation of ads for impressions.
+        // automatically controls the preparation of sdk for impressions.
         if (CAS.settings.loadingMode == LoadingManagerMode.Manual) {
             findViewById<Button>(R.id.loadRewardedBtn).setOnClickListener {
                 label.text = "Loading"

diff --git a/...roid/sampleapp/SampleAppOpenAdActivity.kt → ...ions/sampleapp/SampleAppOpenAdActivity.kt b/...roid/sampleapp/SampleAppOpenAdActivity.kt → ...ions/sampleapp/SampleAppOpenAdActivity.kt
@@ -1,4 +1,4 @@
-package com.cleversolutions.ads.android.sampleapp
+package com.cleveradssolutions.sampleapp
 
 import android.annotation.SuppressLint
 import android.app.Activity
@@ -8,6 +8,7 @@ import android.os.Bundle
 import android.os.CountDownTimer
 import android.util.Log
 import android.widget.TextView
+import com.cleveradssolutions.sampleapp.R
 import com.cleversolutions.ads.*
 import java.util.*
 import java.util.concurrent.TimeUnit

diff --git a/...ds/android/sampleapp/SampleApplication.kt → ...ssolutions/sampleapp/SampleApplication.kt b/...ds/android/sampleapp/SampleApplication.kt → ...ssolutions/sampleapp/SampleApplication.kt
@@ -1,4 +1,4 @@
-package com.cleversolutions.ads.android.sampleapp
+package com.cleveradssolutions.sampleapp
 
 import android.app.Application
 import android.util.Log

diff --git a/settings.gradle b/settings.gradle
@@ -6,7 +6,13 @@ dependencyResolutionManagement {
     repositories {
         google()
         mavenCentral()
-        maven { url = "https://android-sdk.is.com/" }
+        maven{
+            url = "https://repsy.io/mvn/cleveradssolutions/beta"
+        }
+        maven {
+            url = "https://android-sdk.is.com/"
+            content { it.includeGroup("com.ironsource.sdk") }
+        }
         maven {
             url = "https://aa-sdk.s3-eu-west-1.amazonaws.com/android_repo"
             content { it.includeGroup("tv.superawesome.sdk.publisher") }
@@ -33,7 +39,7 @@ dependencyResolutionManagement {
         }
         maven {
             url = "https://cboost.jfrog.io/artifactory/chartboost-ads/"
-            content { it.includeGroup("com.chartboost") }
+            content { it.includeGroup("com.chartboost")}
         }
     }
 }