Merge pull request #21 from kinescope/jitpack-fix

Jitpack fix

gradle.properties

@@ -20,5 +20,4 @@ kotlin.code.style=official
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
-android.disableResourceValidation=true
+android.nonTransitiveRClass=true

jitpack.yml

@@ -1,10 +1,2 @@
 jdk:
   - openjdk17
-before_install:
-  - ./scripts/prepareJitpackEnvironment.sh
-install:
-  - FILE="-Dfile=kotlin-kinescope-player-release.aar"
-  - GROUP_ID="-DgroupId=com.github.kinescope"
-  - ARTIFACT_ID="-DartifactId=kotlin-kinescope-player"
-  - VERSION="-Dversion=0.0.2"
-  - mvn install:install-file $FILE $GROUP_ID $ARTIFACT_ID $VERSION -Dpackaging=aar -DgeneratePom=true

kotlin-kinescope-player/build.gradle

@@ -1,19 +1,12 @@
-buildscript {
-    dependencies {
-        classpath 'com.github.kezong:fat-aar:1.3.8'
-    }
-}
-
 plugins {
     id 'com.android.library'
     id 'org.jetbrains.kotlin.android'
     id 'kotlin-kapt'
     id 'kotlinx-serialization'
     id "com.google.protobuf" version "0.8.17"
+    id "maven-publish"
 }
 
-apply plugin: 'com.kezong.fat-aar'
-
 android {
     compileSdk 33
 
@@ -24,18 +17,18 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
 
-        versionName "0.0.2"
+        versionName "0.0.3"
     }
 
     buildTypes {
         debug {
             minifyEnabled false
-            shrinkResources false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             buildConfigField("String", "VERSION_NAME", "\"${defaultConfig.versionName}\"")
         }
         release {
             minifyEnabled false
-            shrinkResources false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             buildConfigField("String", "VERSION_NAME", "\"${defaultConfig.versionName}\"")
         }
     }
@@ -53,7 +46,8 @@ android {
 
 protobuf {
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.14.0:osx-x86_64'
+        // artifact = 'com.google.protobuf:protoc:3.14.0:osx-x86_64'
+        artifact = 'com.google.protobuf:protoc:3.14.0'
     }
 
     generateProtoTasks {
@@ -67,34 +61,42 @@ protobuf {
     }
 }
 
-configurations.all {
-    resolutionStrategy {
-        force("com.google.protobuf:protobuf-java:3.25.3")
+afterEvaluate {
+    publishing {
+        publications {
+            release(MavenPublication) {
+                from components.release
+
+                groupId = 'com.github.kinescope'
+                artifactId = 'kotlin-kinescope-player'
+                version = "0.0.3"
+            }
+        }
     }
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'androidx.core:core-ktx:1.9.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.google.android.material:material:1.8.0'
 
-    implementation "androidx.core:core-ktx:1.9.0"
-    implementation "androidx.appcompat:appcompat:1.6.1"
-    implementation "com.google.android.material:material:1.9.0"
-    kapt "com.squareup.moshi:moshi-kotlin-codegen:1.14.0"
+    implementation 'com.squareup.okhttp3:okhttp:4.10.0'
+    implementation 'com.squareup.retrofit2:retrofit:2.11.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3'
+    implementation 'com.squareup.retrofit2:converter-moshi:2.11.0'
+    implementation 'com.squareup.retrofit2:converter-protobuf:2.11.0'
+    implementation 'com.squareup.okio:okio:2.10.0'
+    implementation 'com.squareup.moshi:moshi:1.14.0'
+    implementation 'com.squareup.moshi:moshi-adapters:1.14.0'
+    kapt 'com.squareup.moshi:moshi-kotlin-codegen:1.14.0'
 
     def media3Version = "1.1.1"
-    embed "androidx.media3:media3-common:$media3Version"
-    embed "androidx.media3:media3-exoplayer:$media3Version"
-    embed "androidx.media3:media3-exoplayer-dash:$media3Version"
-    embed "androidx.media3:media3-exoplayer-hls:$media3Version"
-    embed "androidx.media3:media3-ui:$media3Version"
-    embed "androidx.media3:media3-decoder:$media3Version"
-    embed "androidx.media3:media3-extractor:$media3Version"
-    embed "androidx.media3:media3-datasource:$media3Version"
-    embed "androidx.media3:media3-container:$media3Version"
-    embed "androidx.media3:media3-database:$media3Version"
-    embed "androidx.media3:media3-session:$media3Version"
+    implementation "androidx.media3:media3-exoplayer:$media3Version"
+    implementation "androidx.media3:media3-exoplayer-dash:$media3Version"
+    implementation "androidx.media3:media3-exoplayer-hls:$media3Version"
+    implementation "androidx.media3:media3-ui:$media3Version"
 
     implementation "com.github.bumptech.glide:glide:4.16.0"
-    implementation "com.squareup.retrofit2:retrofit:2.11.0"
-    implementation "com.squareup.okhttp3:logging-interceptor:4.12.0"
+    implementation "com.google.protobuf:protobuf-java:3.25.3"
+    implementation "androidx.datastore:datastore-core:1.0.0"
 }