Browse Source

0.0.47.beta15 for jitpack

kongzue 2 years ago
parent
commit
a9e9170db2

+ 7 - 1
.idea/compiler.xml

@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11">
+    <bytecodeTargetLevel target="1.7">
+      <module name="DialogXDemo.app" target="11" />
+      <module name="DialogXDemo.DialogX" target="11" />
+      <module name="DialogXDemo.DialogXIOSStyle" target="11" />
+      <module name="DialogXDemo.DialogXKongzueStyle" target="11" />
+      <module name="DialogXDemo.DialogXMaterialYou" target="11" />
+      <module name="DialogXDemo.DialogXMIUIStyle" target="11" />
       <module name="DialogXInterface" target="1.7" />
     </bytecodeTargetLevel>
   </component>

+ 1 - 1
.idea/misc.xml

@@ -347,7 +347,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

+ 3 - 15
DialogX/build.gradle

@@ -1,15 +1,5 @@
 apply plugin: 'com.android.library'
 
-group = "com.kongzue.dialogx"
-version = BUILD_VERSION
-
-ext {
-    PUBLISH_GROUP_ID = "com.kongzue.dialogx"		//项目包名
-    PUBLISH_ARTIFACT_ID = 'DialogX'			//项目名
-    PUBLISH_VERSION = BUILD_VERSION					//版本号
-}
-apply from: "${rootProject.projectDir}/publish-mavencentral.gradle"
-
 android {
     compileSdkVersion 30
 
@@ -37,10 +27,8 @@ artifacts {
     archives sourcesJar
 }
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.3.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.appcompat:appcompat:1.3.0+'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4+'
     compileOnly files('libs\\androidx-rs.jar')
-//    api files('libs\\DialogXInterface.jar')
-//    api project(path: ':DialogXInterface')
-    api "com.kongzue.dialogx.style:DialogXInterface:${DIALOGX_STYLE_VERSION}"
+    api files('libs\\DialogXInterface.jar')
 }

+ 1 - 11
DialogXIOSStyle/build.gradle

@@ -1,16 +1,5 @@
 apply plugin: 'com.android.library'
 
-group = "com.kongzue.dialogx.style.ios"
-version = BUILD_VERSION
-
-
-ext {
-    PUBLISH_GROUP_ID = "com.kongzue.dialogx.style"		//项目包名
-    PUBLISH_ARTIFACT_ID = 'DialogXIOSStyle'			//项目名
-    PUBLISH_VERSION = BUILD_VERSION					//版本号
-}
-apply from: "${rootProject.projectDir}/publish-mavencentral.gradle"
-
 android {
     compileSdkVersion 30
 
@@ -35,6 +24,7 @@ artifacts {
     archives sourcesJar
 }
 dependencies {
+    implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation project(path: ':DialogX')
     compileOnly project(path: ':DialogXInterface')
 }

+ 4 - 35
DialogXInterface/build.gradle

@@ -1,39 +1,8 @@
-//apply plugin: 'java-library'
-apply plugin: 'com.android.library'
+apply plugin: 'java-library'
 
-ext {
-    PUBLISH_GROUP_ID = "com.kongzue.dialogx.style"		//项目包名
-    PUBLISH_ARTIFACT_ID = 'DialogXInterface'			//项目名
-    PUBLISH_VERSION = DIALOGX_STYLE_VERSION					//版本号
-}
-apply from: "${rootProject.projectDir}/publish-mavencentral.gradle"
-
-android {
-    compileSdkVersion 30
-
-    defaultConfig {
-        minSdkVersion 19
-        targetSdkVersion 30
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-}
-task sourcesJar(type: Jar) {
-    from android.sourceSets.main.java.srcDirs
-    classifier = 'sources'
-}
-
-artifacts {
-    archives sourcesJar
-}
 dependencies {
-    //implementation fileTree(dir: 'libs', include: ['*.jar'])
+    compileOnly files('libs\\android.jar')
 }
 
-//sourceCompatibility = "1.7"
-//targetCompatibility = "1.7"
+sourceCompatibility = "1.7"
+targetCompatibility = "1.7"

BIN
DialogXInterface/libs/android.jar


+ 0 - 5
DialogXInterface/src/main/AndroidManifest.xml

@@ -1,5 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.kongzue.dialogx.interfaces">
-
-    /
-</manifest>

+ 1 - 10
DialogXKongzueStyle/build.gradle

@@ -1,15 +1,5 @@
 apply plugin: 'com.android.library'
 
-group = "com.kongzue.dialogx.style.kongzue"
-version = BUILD_VERSION
-
-ext {
-    PUBLISH_GROUP_ID = "com.kongzue.dialogx.style"		//项目包名
-    PUBLISH_ARTIFACT_ID = 'DialogXKongzueStyle'			//项目名
-    PUBLISH_VERSION = BUILD_VERSION					//版本号
-}
-apply from: "${rootProject.projectDir}/publish-mavencentral.gradle"
-
 android {
     compileSdkVersion 30
 
@@ -34,6 +24,7 @@ artifacts {
     archives sourcesJar
 }
 dependencies {
+    implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation project(path: ':DialogX')
     compileOnly project(path: ':DialogXInterface')
 }

+ 1 - 9
DialogXMIUIStyle/build.gradle

@@ -1,14 +1,5 @@
 apply plugin: 'com.android.library'
 
-group = "com.kongzue.dialogx.style.miui"
-version = BUILD_VERSION
-ext {
-    PUBLISH_GROUP_ID = "com.kongzue.dialogx.style"		//项目包名
-    PUBLISH_ARTIFACT_ID = 'DialogXMIUIStyle'			//项目名
-    PUBLISH_VERSION = BUILD_VERSION					//版本号
-}
-apply from: "${rootProject.projectDir}/publish-mavencentral.gradle"
-
 android {
     compileSdkVersion 30
 
@@ -34,6 +25,7 @@ artifacts {
 }
 
 dependencies {
+    implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation project(path: ':DialogX')
     compileOnly project(path: ':DialogXInterface')
 }

+ 1 - 8
DialogXMaterialYou/build.gradle

@@ -2,13 +2,6 @@ plugins {
     id 'com.android.library'
 }
 
-ext {
-    PUBLISH_GROUP_ID = "com.kongzue.dialogx.style"		//项目包名
-    PUBLISH_ARTIFACT_ID = 'DialogXMaterialYouStyle'			//项目名
-    PUBLISH_VERSION = BUILD_VERSION					//版本号
-}
-apply from: "${rootProject.projectDir}/publish-mavencentral.gradle"
-
 android {
     compileSdkVersion 30
 
@@ -35,6 +28,6 @@ android {
 
 dependencies {
     implementation project(path: ':DialogX')
-    implementation 'com.google.android.material:material:1.3.0'
+    implementation 'com.google.android.material:material:1.3.0+'
     compileOnly project(path: ':DialogXInterface')
 }

+ 0 - 105
publish-mavencentral.gradle

@@ -1,105 +0,0 @@
-apply plugin: 'maven-publish'
-apply plugin: 'signing'
-
-task androidSourcesJar(type: Jar) {
-    classifier = 'sources'
-    from android.sourceSets.main.java.source
-}
-
-ext["signing.keyId"] = ''
-ext["signing.password"] = ''
-ext["signing.secretKeyRingFile"] = ''
-ext["ossrhUsername"] = ''
-ext["ossrhPassword"] = ''
-
-File secretPropsFile = project.rootProject.file('local.properties')
-if (secretPropsFile.exists()) {
-    println "Found secret props file, loading props"
-    Properties p = new Properties()
-    p.load(new FileInputStream(secretPropsFile))
-    p.each { name, value ->
-        ext[name] = value
-    }
-} else {
-    println "No props file, loading env vars"
-}
-publishing {
-    publications {
-        release(MavenPublication) {
-            // The coordinates of the library, being set from variables that
-            // we'll set up in a moment
-            groupId PUBLISH_GROUP_ID
-            artifactId PUBLISH_ARTIFACT_ID
-            version PUBLISH_VERSION
-
-            // Two artifacts, the `aar` and the sources
-            artifact("$buildDir/outputs/aar/${project.getName()}-release.aar")
-            artifact androidSourcesJar
-
-            // Self-explanatory metadata for the most part
-            pom {
-                name = PUBLISH_ARTIFACT_ID
-                description = 'Kongzue DialogX'
-                // If your project has a dedicated site, use its URL here
-                url = 'https://github.com/kongzue/DialogX/'
-                licenses {
-                    license {
-                        //协议类型,一般默认Apache License2.0的话不用改:
-                        name = 'The Apache License, Version 2.0'
-                        url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-                    }
-                }
-                developers {
-                    developer {
-                        id = 'kongzue'
-                        name = 'kongzue'
-                        email = 'myzcxhh@live.cn'
-                    }
-                }
-                // Version control info, if you're using GitHub, follow the format as seen here
-                scm {
-                    //修改成你的Git地址:
-                    connection = 'scm:git:github.com/kongzue/DialogX.git'
-                    developerConnection = 'scm:git:ssh://github.com/kongzue/DialogX.git'
-                    //分支地址:
-                    url = 'https://github.com/kongzue/DialogX/tree/master'
-                }
-                // A slightly hacky fix so that your POM will include any transitive dependencies
-                // that your library builds upon
-                withXml {
-                    def dependenciesNode = asNode().appendNode('dependencies')
-
-                    project.configurations.implementation.allDependencies.each {
-                        def dependencyNode = dependenciesNode.appendNode('dependency')
-                        dependencyNode.appendNode('groupId', it.group)
-                        dependencyNode.appendNode('artifactId', it.name)
-                        dependencyNode.appendNode('version', it.version)
-                    }
-                }
-            }
-        }
-    }
-    repositories {
-        // The repository to publish to, Sonatype/MavenCentral
-        maven {
-            // This is an arbitrary name, you may also use "mavencentral" or
-            // any other name that's descriptive for you
-            name = "DialogX"
-
-            def releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
-            def snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots/"
-            // You only need this if you want to publish snapshots, otherwise just set the URL
-            // to the release repo directly
-            url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
-
-            // The username and password we've fetched earlier
-            credentials {
-                username ossrhUsername
-                password ossrhPassword
-            }
-        }
-    }
-}
-signing {
-    sign publishing.publications
-}