clean folders & prepare build scripts

MarcusDunn · Jan 23, 2021 · ee1f78f · ee1f78f
1 parent ce8fce5
commit ee1f78f
Show file tree

Hide file tree

Showing 91 changed files with 521 additions and 762 deletions.
diff --git a/android-compose/build.gradle b/android-compose/build.gradle
@@ -14,7 +14,7 @@ buildscript {
         // Dokka
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version"
         // Android
-        classpath "com.android.tools.build:gradle:$android_gradle_version"
+        classpath "com.android.tools.build:gradle:$androidx_compose_gradle_version"
         classpath "digital.wup:android-maven-publish:$android_maven_publish"
     }
 }

diff --git a/android-compose/clean.sh b/android-compose/clean.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+../gradlew clean
diff --git a/android-compose/gradle.properties b/android-compose/gradle.properties
@@ -28,7 +28,7 @@ kotlin.mpp.enableGranularSourceSetsMetadata=true
 
 # Bintray
 bintray_repo=koin
-bintray_org=koin
+bintray_org=ekito
 bintray_github=https://github.com/InsertKoinIO/koin
 
 # Fixes "Gradle 6.0 generates incorrect versions for Kotlin multiplatform projects

diff --git a/android-compose/gradle/wrapper/gradle-wrapper.properties b/android-compose/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/android-compose/install.sh b/android-compose/install.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+../gradlew publishToMavenLocal
+
diff --git a/...d-compose/koin-android-compose/.gitignore → ...-compose/koin-androidx-compose/.gitignore b/...d-compose/koin-android-compose/.gitignore → ...-compose/koin-androidx-compose/.gitignore
diff --git a/...compose/koin-android-compose/build.gradle → ...ompose/koin-androidx-compose/build.gradle b/...compose/koin-android-compose/build.gradle → ...ompose/koin-androidx-compose/build.gradle
@@ -8,7 +8,7 @@ apply from: "../../gradle/versions.gradle"
 
 ext {
     android_sourceSet = true
-    pom_name = "koin-android-compose"
+    pom_name = "koin-androidx-compose"
     pom_description = "Koin project - koin-androidx-compose"
 }
 
@@ -37,8 +37,8 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerVersion kotlin_version //"1.4.10"
-        kotlinCompilerExtensionVersion androidx_compose_version //"1.0.0-alpha03"
+        kotlinCompilerVersion kotlin_version
+        kotlinCompilerExtensionVersion androidx_compose_version
     }
 }
 
@@ -53,13 +53,12 @@ dependencies {
 
     // Koin
     api "org.koin:koin-android:$koin_version"
-    testImplementation "org.koin:koin-test:$koin_version"
     testImplementation "org.koin:koin-test-junit4:$koin_version"
     testImplementation 'junit:junit:4.13.1'
 
     /* Compose */
-    implementation "androidx.compose.runtime:runtime:$androidx_compose_version"
-    implementation "androidx.compose.ui:ui:$androidx_compose_version"
+    api "androidx.compose.runtime:runtime:$androidx_compose_version"
+    api "androidx.compose.ui:ui:$androidx_compose_version"
 
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
 }

diff --git a/...roid-compose/src/main/AndroidManifest.xml → ...oidx-compose/src/main/AndroidManifest.xml b/...roid-compose/src/main/AndroidManifest.xml → ...oidx-compose/src/main/AndroidManifest.xml
diff --git a/...a/org/koin/androidx/compose/ComposeExt.kt → ...a/org/koin/androidx/compose/ComposeExt.kt b/...a/org/koin/androidx/compose/ComposeExt.kt → ...a/org/koin/androidx/compose/ComposeExt.kt
diff --git a/...n/androidx/compose/ViewModelComposeExt.kt → ...n/androidx/compose/ViewModelComposeExt.kt b/...n/androidx/compose/ViewModelComposeExt.kt → ...n/androidx/compose/ViewModelComposeExt.kt
diff --git a/android-compose/release.sh b/android-compose/release.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+../gradlew bintrayUpload --info --no-parallel
+
+
diff --git a/android-compose/settings.gradle b/android-compose/settings.gradle
@@ -1,4 +1,4 @@
 
-include 'koin-android-compose'
+include 'koin-androidx-compose'
 
 enableFeaturePreview('GRADLE_METADATA')
diff --git a/android-compose/test.sh b/android-compose/test.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+../gradlew test --parallel
diff --git a/android/clean.sh b/android/clean.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+../gradlew clean
diff --git a/android/gradle.properties b/android/gradle.properties
@@ -28,7 +28,7 @@ kotlin.mpp.enableGranularSourceSetsMetadata=true
 
 # Bintray
 bintray_repo=koin
-bintray_org=koin
+bintray_org=ekito
 bintray_github=https://github.com/InsertKoinIO/koin
 
 # Fixes "Gradle 6.0 generates incorrect versions for Kotlin multiplatform projects

diff --git a/android/install.sh b/android/install.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+../gradlew publishToMavenLocal
+
diff --git a/android/koin-android-ext/build.gradle b/android/koin-android-ext/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 
 ext {
     android_sourceSet = true
-    pom_name = "koin-androidx-ext"
+    pom_name = "koin-android-ext"
     pom_description = "Koin project - koin-androidx-ext"
 }
 

diff --git a/android/koin-android/build.gradle b/android/koin-android/build.gradle
@@ -39,12 +39,10 @@ dependencies {
         exclude group: "androidx.legacy"
     }
 
-//    implementation "androidx.activity:activity:1.2.0-rc01"
     implementation "androidx.activity:activity-ktx:1.1.0"
     implementation "androidx.fragment:fragment-ktx:$androidx_fragment_version"
 
     testImplementation "org.koin:koin-test-junit4:$koin_version"
-//    testImplementation "junit:junit:$junit_version"
     testImplementation "org.mockito:mockito-inline:$mockito_version"
 
 }

diff --git a/...oid/koin-android-workmanager/build.gradle → ...id/koin-androidx-workmanager/build.gradle b/...oid/koin-android-workmanager/build.gradle → ...id/koin-androidx-workmanager/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 
 ext {
     android_sourceSet = true
-    pom_name = "koin-android-workmanager"
+    pom_name = "koin-androidx-workmanager"
     pom_description = "Koin project - koin-androidx-workmanager"
 }
 
@@ -39,8 +39,8 @@ dependencies {
 //    testImplementation "junit:junit:$junit_version"
     testImplementation "org.mockito:mockito-inline:$mockito_version"
 
-    androidTestImplementation 'androidx.test:runner:1.2.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1' //+ androidxTestJUnitVersion
+    androidTestImplementation 'androidx.test:runner:1.3.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2' //+ androidxTestJUnitVersion
     androidTestImplementation "androidx.work:work-testing:$androidx_workmanager"
 
 }

diff --git a/...oin-android-workmanager/gradle.properties → ...in-androidx-workmanager/gradle.properties b/...oin-android-workmanager/gradle.properties → ...in-androidx-workmanager/gradle.properties
diff --git a/...-workmanager/src/main/AndroidManifest.xml → ...-workmanager/src/main/AndroidManifest.xml b/...-workmanager/src/main/AndroidManifest.xml → ...-workmanager/src/main/AndroidManifest.xml
diff --git a/...oin/androidx/workmanager/dsl/ModuleExt.kt → ...oin/androidx/workmanager/dsl/ModuleExt.kt b/...oin/androidx/workmanager/dsl/ModuleExt.kt → ...oin/androidx/workmanager/dsl/ModuleExt.kt
diff --git a/...n/androidx/workmanager/dsl/ScopeDSLExt.kt → ...n/androidx/workmanager/dsl/ScopeDSLExt.kt b/...n/androidx/workmanager/dsl/ScopeDSLExt.kt → ...n/androidx/workmanager/dsl/ScopeDSLExt.kt
diff --git a/.../workmanager/factory/KoinWorkerFactory.kt → .../workmanager/factory/KoinWorkerFactory.kt b/.../workmanager/factory/KoinWorkerFactory.kt → .../workmanager/factory/KoinWorkerFactory.kt
diff --git a/...dx/workmanager/koin/KoinApplicationExt.kt → ...dx/workmanager/koin/KoinApplicationExt.kt b/...dx/workmanager/koin/KoinApplicationExt.kt → ...dx/workmanager/koin/KoinApplicationExt.kt
diff --git a/.../org/koin/androidx/workmanager/Classes.kt → .../org/koin/androidx/workmanager/Classes.kt b/.../org/koin/androidx/workmanager/Classes.kt → .../org/koin/androidx/workmanager/Classes.kt
diff --git a/...oidx/workmanager/KoinWorkerFactoryTest.kt → ...oidx/workmanager/KoinWorkerFactoryTest.kt b/...oidx/workmanager/KoinWorkerFactoryTest.kt → ...oidx/workmanager/KoinWorkerFactoryTest.kt
diff --git a/...androidx/workmanager/ScopeDSLExtKtTest.kt → ...androidx/workmanager/ScopeDSLExtKtTest.kt b/...androidx/workmanager/ScopeDSLExtKtTest.kt → ...androidx/workmanager/ScopeDSLExtKtTest.kt
diff --git a/android/release.sh b/android/release.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+../gradlew bintrayUpload --info --no-parallel
+
+
diff --git a/android/settings.gradle b/android/settings.gradle
@@ -2,6 +2,6 @@
 // Android
 include 'koin-android'
 include 'koin-android-ext'
-include 'koin-android-workmanager'
+include 'koin-androidx-workmanager'
 
 enableFeaturePreview('GRADLE_METADATA')
diff --git a/android/test.sh b/android/test.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+../gradlew test --parallel
diff --git a/core/build.gradle b/core/build.gradle
@@ -50,7 +50,7 @@ allprojects {
         targetCompatibility = JavaVersion.VERSION_1_8
 
         kotlinOptions {
-            jvmTarget = '1.8'
+//            jvmTarget = '1.8'
             apiVersion = '1.4'
             languageVersion = '1.4'
             freeCompilerArgs = ["-XXLanguage:+InlineClasses"]

diff --git a/core/clean.sh b/core/clean.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+../gradlew clean
diff --git a/core/gradle.properties b/core/gradle.properties
@@ -28,7 +28,7 @@ kotlin.mpp.enableGranularSourceSetsMetadata=true
 
 # Bintray
 bintray_repo=koin
-bintray_org=koin
+bintray_org=ekito
 bintray_github=https://github.com/InsertKoinIO/koin
 
 # Fixes "Gradle 6.0 generates incorrect versions for Kotlin multiplatform projects

diff --git a/core/gradle/wrapper/gradle-wrapper.properties b/core/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/core/gradlew b/core/gradlew
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,5 @@
		#!/bin/sh

		../gradlew bintrayUpload --info --no-parallel