Release: Version 1.1.0

.github/workflows/publish.yaml

@@ -66,7 +66,7 @@ jobs:
 
         # Updated to 16.3 to meet Kotlin 2.2.10 requirements
       - name: Set up Xcode version
-        run: sudo xcode-select -s /Applications/Xcode_16.3.app/Contents/Developer
+        run: sudo xcode-select -s /Applications/Xcode_26.2.app/Contents/Developer
 
       - name: Publish to MavenCentral
         if: ${{ github.event_name != 'pull_request' }}

VERSIONS.md

@@ -30,4 +30,5 @@ Here's a list of the Basic-Ads dependency versions for each release after 0.2.0:
 |         1.0.0         |   2.2.21    |         1.9.3          |    1.9.1    |    24.8.0 / 12.14.0     |     4.0.0 / 3.1.0     |
 |     1.1.0-beta01      |    2.3.0    |         1.9.3          |    1.9.1    |    24.9.0 / 12.14.0     |     4.0.0 / 3.1.0     |
 |     1.1.0-beta02      |    2.3.0    |         1.9.3          |    1.9.1    |    24.9.0 / 12.14.0     |     4.0.0 / 3.1.0     |
-|     1.1.0-beta03      |    2.3.0    |         1.9.3          |    1.9.1    |    24.9.0 / 12.14.0     |     4.0.0 / 3.1.0     |
+|     1.1.0-beta03      |    2.3.0    |         1.9.3          |    1.9.1    |    24.9.0 / 12.14.0     |     4.0.0 / 3.1.0     |
+|         1.1.0         |    2.3.0    |         1.9.3          |    1.9.1    |    24.9.0 / 12.14.0     |     4.0.0 / 3.1.0     |

basic-ads/api/basic-ads.api

@@ -192,9 +192,6 @@ public abstract interface annotation class app/lexilabs/basic/ads/DependsOnGoogl
 public abstract interface annotation class app/lexilabs/basic/ads/DependsOnGoogleUserMessagingPlatform : java/lang/annotation/Annotation {
 }
 
-public abstract interface annotation class app/lexilabs/basic/ads/ExperimentalBasicAdsFeature : java/lang/annotation/Annotation {
-}
-
 public final class app/lexilabs/basic/ads/FullscreenContentDelegate : com/google/android/gms/ads/FullScreenContentCallback {
 	public static final field $stable I
 	public fun <init> (Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;)V
@@ -371,7 +368,7 @@ public final class app/lexilabs/basic/ads/nativead/NativeAdConvertersKt {
 	public static final fun toCommon (Lcom/google/android/gms/ads/MediaContent;)Lapp/lexilabs/basic/ads/nativead/NativeAdData$MediaContent;
 	public static final fun toCommon (Lcom/google/android/gms/ads/MuteThisAdReason;)Lapp/lexilabs/basic/ads/nativead/NativeAdData$MuteThisAdReason;
 	public static final fun toCommon (Lcom/google/android/gms/ads/nativead/NativeAd$AdChoicesInfo;)Lapp/lexilabs/basic/ads/nativead/NativeAdData$AdChoicesInfo;
-	public static final fun toCommon (Lcom/google/android/gms/ads/nativead/NativeAd$Image;)Lapp/lexilabs/basic/ads/nativead/NativeAdData$Image;
+	public static final fun toCommon (Lcom/google/android/gms/ads/nativead/NativeAd$Image;)Lapp/lexilabs/basic/ads/nativead/NativeAdData$AdIcon;
 }
 
 public final class app/lexilabs/basic/ads/nativead/NativeAdData {
@@ -383,7 +380,7 @@ public final class app/lexilabs/basic/ads/nativead/NativeAdData {
 	public final fun getBody ()Ljava/lang/String;
 	public final fun getCallToAction ()Ljava/lang/String;
 	public final fun getHeadline ()Ljava/lang/String;
-	public final fun getIcon ()Lapp/lexilabs/basic/ads/nativead/NativeAdData$Image;
+	public final fun getIcon ()Lapp/lexilabs/basic/ads/nativead/NativeAdData$AdIcon;
 	public final fun getMediaContent ()Lapp/lexilabs/basic/ads/nativead/NativeAdData$MediaContent;
 	public final fun getMuteThisAdReasons ()Ljava/util/List;
 	public final fun getPlacementId ()Ljava/lang/Long;
@@ -395,11 +392,11 @@ public final class app/lexilabs/basic/ads/nativead/NativeAdData {
 public final class app/lexilabs/basic/ads/nativead/NativeAdData$AdChoicesInfo {
 	public static final field $stable I
 	public fun <init> (Ljava/util/List;Ljava/lang/CharSequence;)V
-	public final fun getImages ()Ljava/util/List;
+	public final fun getAdIcons ()Ljava/util/List;
 	public final fun getText ()Ljava/lang/CharSequence;
 }
 
-public final class app/lexilabs/basic/ads/nativead/NativeAdData$Image {
+public final class app/lexilabs/basic/ads/nativead/NativeAdData$AdIcon {
 	public static final field $stable I
 	public fun <init> (Landroid/graphics/drawable/Drawable;DLandroid/net/Uri;)V
 	public final fun getDrawable ()Landroid/graphics/drawable/Drawable;
@@ -428,23 +425,9 @@ public final class app/lexilabs/basic/ads/nativead/NativeAdDefault : app/lexilab
 	public fun <init> ()V
 	public fun <init> (Lapp/lexilabs/basic/ads/nativead/NativeAdData;)V
 	public synthetic fun <init> (Lapp/lexilabs/basic/ads/nativead/NativeAdData;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun AdChoices (Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;I)V
-	public fun Advertiser (Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;I)V
-	public fun Attribution (Ljava/lang/String;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;I)V
-	public fun Body (Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;I)V
-	public fun CallToAction (Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;I)V
-	public fun Headline (Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;I)V
-	public fun Icon (Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;I)V
-	public fun Media (Landroidx/compose/ui/Modifier;Lapp/lexilabs/basic/ads/nativead/ScaleType;Landroidx/compose/runtime/Composer;I)V
-	public final fun NativeAdButton-t6yy7ic (Ljava/lang/String;Landroidx/compose/ui/Modifier;JJLandroidx/compose/ui/graphics/Shape;Landroidx/compose/runtime/Composer;II)V
-	public fun Price (Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;I)V
 	public fun Show (Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;I)V
-	public fun StarRating (Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;I)V
-	public fun Store (Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;I)V
-	public final fun Supervisor (Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;I)V
 	public fun copy (Lapp/lexilabs/basic/ads/nativead/NativeAdData;)Lapp/lexilabs/basic/ads/nativead/NativeAdTemplate;
 	public fun getNativeAdData ()Lapp/lexilabs/basic/ads/nativead/NativeAdData;
-	public fun invoke (Lapp/lexilabs/basic/ads/nativead/NativeAdData;)Lapp/lexilabs/basic/ads/nativead/NativeAdTemplate;
 }
 
 public final class app/lexilabs/basic/ads/nativead/NativeAdHandler {
@@ -466,36 +449,30 @@ public abstract interface class app/lexilabs/basic/ads/nativead/NativeAdScope {
 public abstract class app/lexilabs/basic/ads/nativead/NativeAdTemplate : app/lexilabs/basic/ads/nativead/NativeAdScope {
 	public static final field $stable I
 	public fun <init> (Lapp/lexilabs/basic/ads/nativead/NativeAdData;)V
-	public abstract fun AdChoices (Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;I)V
-	public abstract fun Advertiser (Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;I)V
-	public abstract fun Attribution (Ljava/lang/String;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;I)V
-	public abstract fun Body (Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;I)V
-	public abstract fun CallToAction (Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;I)V
-	public abstract fun Headline (Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;I)V
-	public abstract fun Icon (Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;I)V
-	public abstract fun Media (Landroidx/compose/ui/Modifier;Lapp/lexilabs/basic/ads/nativead/ScaleType;Landroidx/compose/runtime/Composer;I)V
-	public abstract fun Price (Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;I)V
+	public final fun AdChoices (Lapp/lexilabs/basic/ads/nativead/NativeAdTemplate$SupervisorScope;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V
+	public final fun Advertiser (Lapp/lexilabs/basic/ads/nativead/NativeAdTemplate$SupervisorScope;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V
+	public final fun Attribution (Lapp/lexilabs/basic/ads/nativead/NativeAdTemplate$SupervisorScope;Ljava/lang/String;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V
+	public final fun Body (Lapp/lexilabs/basic/ads/nativead/NativeAdTemplate$SupervisorScope;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V
+	public final fun CallToAction (Lapp/lexilabs/basic/ads/nativead/NativeAdTemplate$SupervisorScope;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V
+	public final fun Headline (Lapp/lexilabs/basic/ads/nativead/NativeAdTemplate$SupervisorScope;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V
+	public final fun Icon (Lapp/lexilabs/basic/ads/nativead/NativeAdTemplate$SupervisorScope;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V
+	public final fun Media (Lapp/lexilabs/basic/ads/nativead/NativeAdTemplate$SupervisorScope;Landroidx/compose/ui/Modifier;Lapp/lexilabs/basic/ads/nativead/ScaleType;Landroidx/compose/runtime/Composer;II)V
+	public final fun NativeAdButton-jB83MbM (Lapp/lexilabs/basic/ads/nativead/NativeAdTemplate$SupervisorScope;Ljava/lang/String;Landroidx/compose/ui/Modifier;JJLandroidx/compose/ui/graphics/Shape;Landroidx/compose/runtime/Composer;II)V
+	public final fun Price (Lapp/lexilabs/basic/ads/nativead/NativeAdTemplate$SupervisorScope;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V
 	public abstract fun Show (Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;I)V
-	public abstract fun StarRating (Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;I)V
-	public abstract fun Store (Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;I)V
+	public final fun StarRating (Lapp/lexilabs/basic/ads/nativead/NativeAdTemplate$SupervisorScope;Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
+	public final fun Store (Lapp/lexilabs/basic/ads/nativead/NativeAdTemplate$SupervisorScope;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V
+	public final fun Supervisor (Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
 	public abstract fun copy (Lapp/lexilabs/basic/ads/nativead/NativeAdData;)Lapp/lexilabs/basic/ads/nativead/NativeAdTemplate;
 	public fun getNativeAdData ()Lapp/lexilabs/basic/ads/nativead/NativeAdData;
-	public abstract fun invoke (Lapp/lexilabs/basic/ads/nativead/NativeAdData;)Lapp/lexilabs/basic/ads/nativead/NativeAdTemplate;
+	public final fun invoke (Lapp/lexilabs/basic/ads/nativead/NativeAdData;)Lapp/lexilabs/basic/ads/nativead/NativeAdTemplate;
 }
 
 public final class app/lexilabs/basic/ads/nativead/NativeAdTemplate$ComposeDefaultImpls {
-	public static final fun AdChoices$default (Landroidx/compose/ui/Modifier;Lapp/lexilabs/basic/ads/nativead/NativeAdTemplate;Landroidx/compose/runtime/Composer;II)V
-	public static final fun Advertiser$default (Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Lapp/lexilabs/basic/ads/nativead/NativeAdTemplate;Landroidx/compose/runtime/Composer;II)V
-	public static final fun Attribution$default (Ljava/lang/String;Landroidx/compose/ui/Modifier;Lapp/lexilabs/basic/ads/nativead/NativeAdTemplate;Landroidx/compose/runtime/Composer;II)V
-	public static final fun Body$default (Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Lapp/lexilabs/basic/ads/nativead/NativeAdTemplate;Landroidx/compose/runtime/Composer;II)V
-	public static final fun CallToAction$default (Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Lapp/lexilabs/basic/ads/nativead/NativeAdTemplate;Landroidx/compose/runtime/Composer;II)V
-	public static final fun Headline$default (Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Lapp/lexilabs/basic/ads/nativead/NativeAdTemplate;Landroidx/compose/runtime/Composer;II)V
-	public static final fun Icon$default (Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Lapp/lexilabs/basic/ads/nativead/NativeAdTemplate;Landroidx/compose/runtime/Composer;II)V
-	public static final fun Media$default (Landroidx/compose/ui/Modifier;Lapp/lexilabs/basic/ads/nativead/ScaleType;Lapp/lexilabs/basic/ads/nativead/NativeAdTemplate;Landroidx/compose/runtime/Composer;II)V
-	public static final fun Price$default (Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Lapp/lexilabs/basic/ads/nativead/NativeAdTemplate;Landroidx/compose/runtime/Composer;II)V
 	public static final fun Show$default (Landroidx/compose/ui/Modifier;Lapp/lexilabs/basic/ads/nativead/NativeAdTemplate;Landroidx/compose/runtime/Composer;II)V
-	public static final fun StarRating$default (Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Lapp/lexilabs/basic/ads/nativead/NativeAdTemplate;Landroidx/compose/runtime/Composer;II)V
-	public static final fun Store$default (Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Lapp/lexilabs/basic/ads/nativead/NativeAdTemplate;Landroidx/compose/runtime/Composer;II)V
+}
+
+public abstract interface class app/lexilabs/basic/ads/nativead/NativeAdTemplate$SupervisorScope {
 }
 
 public final class app/lexilabs/basic/ads/nativead/NativeAdViewKt {

basic-ads/src/androidMain/kotlin/app/lexilabs/basic/ads/nativead/NativeAdConverters.kt

@@ -6,13 +6,13 @@ import com.google.android.gms.ads.nativead.NativeAd
 
 public fun NativeAd.AdChoicesInfo.toCommon(): NativeAdData.AdChoicesInfo {
     return NativeAdData.AdChoicesInfo(
-        images = this.images.map { it.toCommon() },
+        adIcons = this.images.map { it.toCommon() },
         text = this.text
     )
 }
 
-public fun NativeAd.Image.toCommon(): NativeAdData.Image {
-    return NativeAdData.Image(
+public fun NativeAd.Image.toCommon(): NativeAdData.AdIcon {
+    return NativeAdData.AdIcon(
         drawable = this.drawable,
         scale = this.scale,
         uri = this.uri

basic-ads/src/androidMain/kotlin/app/lexilabs/basic/ads/nativead/NativeAdData.kt

@@ -18,7 +18,7 @@ public actual class NativeAdData (
         get() = android.callToAction
     public actual val headline: String?
         get() = android.headline
-    public actual val icon: Image?
+    public actual val icon: AdIcon?
         get() = android.icon?.toCommon()
     public actual val mediaContent: MediaContent?
         get() = android.mediaContent?.toCommon()
@@ -33,10 +33,10 @@ public actual class NativeAdData (
     public actual val store: String?
         get() = android.store
     public actual class AdChoicesInfo (
-        public val images: List<Image>,
+        public val adIcons: List<AdIcon>,
         public val text: CharSequence
     )
-    public actual class Image (
+    public actual class AdIcon (
         public val drawable: Drawable?,
         public val scale: Double,
         public val uri: Uri?